diff --git a/README.md b/README.md index 17b4327909..02f2c3c5cd 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/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) +[![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) ## 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`: ``` - com.amazon.ion + software.amazon.ion ion-java 1.5.1 @@ -67,11 +67,11 @@ dependency into your project's `pom.xml`: #### 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 +official groupId was changed to `software.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 +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. diff --git a/pom.xml b/pom.xml index 051cdd3cb9..9f0a7a5b2e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 4.0.0 - com.amazon.ion + software.amazon.ion ion-java 1.5.1 bundle @@ -136,16 +136,16 @@ - !com.amazon.ion.apps.*, - !com.amazon.ion.impl.*, - com.amazon.ion.*, + !software.amazon.ion.apps.*, + !software.amazon.ion.impl.*, + software.amazon.ion.*, - com.amazon.ion.impl._Private_CommandLine + software.amazon.ion.impl._Private_CommandLine ${build.time} ${project.version} - com.amazon.ion + software.amazon.ion @@ -217,11 +217,11 @@ - com.amazon.ion.apps:com.amazon.ion.impl + software.amazon.ion.apps:software.amazon.ion.impl **/*Private* - ${project.basedir}/src/com/amazon/ion/overview.html + ${project.basedir}/src/software.amazon.ion/overview.html Amazon Ion Java ${project.version} API Reference Ion Java ${project.version}
Amazon Ion Java ${project.version} API Reference
@@ -290,11 +290,11 @@ maven-javadoc-plugin 2.10.3 - com.amazon.ion.apps:com.amazon.ion.impl + software.amazon.ion.apps:software.amazon.ion.impl **/*Private* - ${project.basedir}/src/com/amazon/ion/overview.html + ${project.basedir}/src/software.amazon.ion/overview.html Amazon Ion Java ${project.version} API Reference Ion Java ${project.version}
Amazon Ion Java ${project.version} API Reference
diff --git a/src/com/amazon/ion/impl/bin/package-info.java b/src/com/amazon/ion/impl/bin/package-info.java deleted file mode 100644 index 14ec59635e..0000000000 --- a/src/com/amazon/ion/impl/bin/package-info.java +++ /dev/null @@ -1,51 +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. - */ - -/** - * Provides the implementation for the second-generation Ion binary implementation. - * At this time, this is limited to a binary {@link com.amazon.ion.IonWriter}. - * - *

- * 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 Managed means - * in this context. - * - *

Block API

- * 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. - *

- * 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. - *

- * 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. - * - *

Raw Binary Ion Writer

- * 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 sub-field encodings (e.g. VarInt, VarUInt, and UTF-8). - * - *

Managed Binary Ion Writer

- * 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/com/amazon/ion/ContainedValueException.java b/src/software/amazon/ion/ContainedValueException.java similarity index 97% rename from src/com/amazon/ion/ContainedValueException.java rename to src/software/amazon/ion/ContainedValueException.java index a7c5deea20..3cef529447 100644 --- a/src/com/amazon/ion/ContainedValueException.java +++ b/src/software/amazon/ion/ContainedValueException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An error caused by adding an {@link IonValue} into a container when it's diff --git a/src/com/amazon/ion/Decimal.java b/src/software/amazon/ion/Decimal.java similarity index 99% rename from src/com/amazon/ion/Decimal.java rename to src/software/amazon/ion/Decimal.java index bde45ee1f1..b74f80f8ee 100644 --- a/src/com/amazon/ion/Decimal.java +++ b/src/software/amazon/ion/Decimal.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/EmptySymbolException.java b/src/software/amazon/ion/EmptySymbolException.java similarity index 97% rename from src/com/amazon/ion/EmptySymbolException.java rename to src/software/amazon/ion/EmptySymbolException.java index eb1351906f..28bd40a0ad 100644 --- a/src/com/amazon/ion/EmptySymbolException.java +++ b/src/software/amazon/ion/EmptySymbolException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An error caused by a symbol not containing at least one character for diff --git a/src/com/amazon/ion/IntegerSize.java b/src/software/amazon/ion/IntegerSize.java similarity index 97% rename from src/com/amazon/ion/IntegerSize.java rename to src/software/amazon/ion/IntegerSize.java index 7ced059a0f..4860737892 100644 --- a/src/com/amazon/ion/IntegerSize.java +++ b/src/software/amazon/ion/IntegerSize.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.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/software/amazon/ion/InvalidSystemSymbolException.java similarity index 97% rename from src/com/amazon/ion/InvalidSystemSymbolException.java rename to src/software/amazon/ion/InvalidSystemSymbolException.java index c718ba46e4..4b55c4dcd7 100644 --- a/src/com/amazon/ion/InvalidSystemSymbolException.java +++ b/src/software/amazon/ion/InvalidSystemSymbolException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/IonBinaryWriter.java b/src/software/amazon/ion/IonBinaryWriter.java similarity index 98% rename from src/com/amazon/ion/IonBinaryWriter.java rename to src/software/amazon/ion/IonBinaryWriter.java index fcbf94edaa..74925b368e 100644 --- a/src/com/amazon/ion/IonBinaryWriter.java +++ b/src/software/amazon/ion/IonBinaryWriter.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/IonBlob.java b/src/software/amazon/ion/IonBlob.java similarity index 97% rename from src/com/amazon/ion/IonBlob.java rename to src/software/amazon/ion/IonBlob.java index 503a865579..a50cb884ee 100644 --- a/src/com/amazon/ion/IonBlob.java +++ b/src/software/amazon/ion/IonBlob.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.IOException; diff --git a/src/com/amazon/ion/IonBool.java b/src/software/amazon/ion/IonBool.java similarity index 98% rename from src/com/amazon/ion/IonBool.java rename to src/software/amazon/ion/IonBool.java index 4ed612194e..82da160576 100644 --- a/src/com/amazon/ion/IonBool.java +++ b/src/software/amazon/ion/IonBool.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; diff --git a/src/com/amazon/ion/IonCatalog.java b/src/software/amazon/ion/IonCatalog.java similarity index 97% rename from src/com/amazon/ion/IonCatalog.java rename to src/software/amazon/ion/IonCatalog.java index cf79390d92..c94deb4444 100644 --- a/src/com/amazon/ion/IonCatalog.java +++ b/src/software/amazon/ion/IonCatalog.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.system.IonSystemBuilder; -import com.amazon.ion.system.SimpleCatalog; +import software.amazon.ion.system.IonSystemBuilder; +import software.amazon.ion.system.SimpleCatalog; /** diff --git a/src/com/amazon/ion/IonClob.java b/src/software/amazon/ion/IonClob.java similarity index 98% rename from src/com/amazon/ion/IonClob.java rename to src/software/amazon/ion/IonClob.java index 9004337913..7711273dd9 100644 --- a/src/com/amazon/ion/IonClob.java +++ b/src/software/amazon/ion/IonClob.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.Reader; import java.nio.charset.Charset; diff --git a/src/com/amazon/ion/IonContainer.java b/src/software/amazon/ion/IonContainer.java similarity index 99% rename from src/com/amazon/ion/IonContainer.java rename to src/software/amazon/ion/IonContainer.java index 12805d8ea4..68c4cc7670 100644 --- a/src/com/amazon/ion/IonContainer.java +++ b/src/software/amazon/ion/IonContainer.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.util.Collection; import java.util.Iterator; diff --git a/src/com/amazon/ion/IonDatagram.java b/src/software/amazon/ion/IonDatagram.java similarity index 99% rename from src/com/amazon/ion/IonDatagram.java rename to src/software/amazon/ion/IonDatagram.java index 72394b35d3..058b0a6fda 100644 --- a/src/com/amazon/ion/IonDatagram.java +++ b/src/software/amazon/ion/IonDatagram.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/IonDecimal.java b/src/software/amazon/ion/IonDecimal.java similarity index 99% rename from src/com/amazon/ion/IonDecimal.java rename to src/software/amazon/ion/IonDecimal.java index 40871bb2a3..51356a0fa3 100644 --- a/src/com/amazon/ion/IonDecimal.java +++ b/src/software/amazon/ion/IonDecimal.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/IonException.java b/src/software/amazon/ion/IonException.java similarity index 99% rename from src/com/amazon/ion/IonException.java rename to src/software/amazon/ion/IonException.java index f4d577f8ea..79b6c6748b 100644 --- a/src/com/amazon/ion/IonException.java +++ b/src/software/amazon/ion/IonException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.IOException; import java.util.IdentityHashMap; diff --git a/src/com/amazon/ion/IonFloat.java b/src/software/amazon/ion/IonFloat.java similarity index 99% rename from src/com/amazon/ion/IonFloat.java rename to src/software/amazon/ion/IonFloat.java index e4fa2be69d..5368012fed 100644 --- a/src/com/amazon/ion/IonFloat.java +++ b/src/software/amazon/ion/IonFloat.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/IonInt.java b/src/software/amazon/ion/IonInt.java similarity index 98% rename from src/com/amazon/ion/IonInt.java rename to src/software/amazon/ion/IonInt.java index 2270b0a918..7eb9685e62 100644 --- a/src/com/amazon/ion/IonInt.java +++ b/src/software/amazon/ion/IonInt.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigInteger; diff --git a/src/com/amazon/ion/IonList.java b/src/software/amazon/ion/IonList.java similarity index 97% rename from src/com/amazon/ion/IonList.java rename to src/software/amazon/ion/IonList.java index 0b697fb368..fbf29e122b 100644 --- a/src/com/amazon/ion/IonList.java +++ b/src/software/amazon/ion/IonList.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.util.Collection; diff --git a/src/com/amazon/ion/IonLoader.java b/src/software/amazon/ion/IonLoader.java similarity index 99% rename from src/com/amazon/ion/IonLoader.java rename to src/software/amazon/ion/IonLoader.java index aaab75938a..15b84e8459 100644 --- a/src/com/amazon/ion/IonLoader.java +++ b/src/software/amazon/ion/IonLoader.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.File; import java.io.IOException; diff --git a/src/com/amazon/ion/IonLob.java b/src/software/amazon/ion/IonLob.java similarity index 98% rename from src/com/amazon/ion/IonLob.java rename to src/software/amazon/ion/IonLob.java index 780b3a61a2..2563f3366b 100644 --- a/src/com/amazon/ion/IonLob.java +++ b/src/software/amazon/ion/IonLob.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.InputStream; diff --git a/src/com/amazon/ion/IonMutableCatalog.java b/src/software/amazon/ion/IonMutableCatalog.java similarity index 97% rename from src/com/amazon/ion/IonMutableCatalog.java rename to src/software/amazon/ion/IonMutableCatalog.java index 18c528812c..eec1c67e17 100644 --- a/src/com/amazon/ion/IonMutableCatalog.java +++ b/src/software/amazon/ion/IonMutableCatalog.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An {@link IonCatalog} that can be updated. diff --git a/src/com/amazon/ion/IonNull.java b/src/software/amazon/ion/IonNull.java similarity index 97% rename from src/com/amazon/ion/IonNull.java rename to src/software/amazon/ion/IonNull.java index a841a2901d..ec1f360e41 100644 --- a/src/com/amazon/ion/IonNull.java +++ b/src/software/amazon/ion/IonNull.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * The Ion null value, also known as null.null. diff --git a/src/com/amazon/ion/IonNumber.java b/src/software/amazon/ion/IonNumber.java similarity index 97% rename from src/com/amazon/ion/IonNumber.java rename to src/software/amazon/ion/IonNumber.java index dd17c55975..57f1b4cc15 100644 --- a/src/com/amazon/ion/IonNumber.java +++ b/src/software/amazon/ion/IonNumber.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * The IonNumber interface is a fore runner of a common base for the diff --git a/src/com/amazon/ion/IonReader.java b/src/software/amazon/ion/IonReader.java similarity index 99% rename from src/com/amazon/ion/IonReader.java rename to src/software/amazon/ion/IonReader.java index 7675b4b436..122872d1c4 100644 --- a/src/com/amazon/ion/IonReader.java +++ b/src/software/amazon/ion/IonReader.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.facet.Faceted; +import software.amazon.ion.facet.Faceted; import java.io.Closeable; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/IonSequence.java b/src/software/amazon/ion/IonSequence.java similarity index 99% rename from src/com/amazon/ion/IonSequence.java rename to src/software/amazon/ion/IonSequence.java index 9621859e59..69fd74b197 100644 --- a/src/com/amazon/ion/IonSequence.java +++ b/src/software/amazon/ion/IonSequence.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.util.Collection; import java.util.Iterator; diff --git a/src/com/amazon/ion/IonSexp.java b/src/software/amazon/ion/IonSexp.java similarity index 97% rename from src/com/amazon/ion/IonSexp.java rename to src/software/amazon/ion/IonSexp.java index 961d5a5354..09d8a5d681 100644 --- a/src/com/amazon/ion/IonSexp.java +++ b/src/software/amazon/ion/IonSexp.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.util.Collection; diff --git a/src/com/amazon/ion/IonString.java b/src/software/amazon/ion/IonString.java similarity index 97% rename from src/com/amazon/ion/IonString.java rename to src/software/amazon/ion/IonString.java index c7d471610e..d595fb352c 100644 --- a/src/com/amazon/ion/IonString.java +++ b/src/software/amazon/ion/IonString.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An Ion string value. diff --git a/src/com/amazon/ion/IonStruct.java b/src/software/amazon/ion/IonStruct.java similarity index 99% rename from src/com/amazon/ion/IonStruct.java rename to src/software/amazon/ion/IonStruct.java index 6ebb0be081..dc244e4aed 100644 --- a/src/com/amazon/ion/IonStruct.java +++ b/src/software/amazon/ion/IonStruct.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.util.Map; diff --git a/src/com/amazon/ion/IonSymbol.java b/src/software/amazon/ion/IonSymbol.java similarity index 98% rename from src/com/amazon/ion/IonSymbol.java rename to src/software/amazon/ion/IonSymbol.java index 78fc2b711d..b8b1d844f4 100644 --- a/src/com/amazon/ion/IonSymbol.java +++ b/src/software/amazon/ion/IonSymbol.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An Ion symbol value. diff --git a/src/com/amazon/ion/IonSystem.java b/src/software/amazon/ion/IonSystem.java similarity index 99% rename from src/com/amazon/ion/IonSystem.java rename to src/software/amazon/ion/IonSystem.java index f7bb29c038..759bbbddb5 100644 --- a/src/com/amazon/ion/IonSystem.java +++ b/src/software/amazon/ion/IonSystem.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.system.IonSystemBuilder; -import com.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.system.IonSystemBuilder; +import software.amazon.ion.system.IonTextWriterBuilder; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -39,7 +39,7 @@ * {@link #clone(IonValue)}. *

* To create an {@code IonSystem}, - * see {@link com.amazon.ion.system.IonSystemBuilder}. + * see {@link software.amazon.ion.system.IonSystemBuilder}. *

* Implementations of this interface are safe for use by multiple * threads. diff --git a/src/com/amazon/ion/IonText.java b/src/software/amazon/ion/IonText.java similarity index 98% rename from src/com/amazon/ion/IonText.java rename to src/software/amazon/ion/IonText.java index efb510c521..61c2b06feb 100644 --- a/src/com/amazon/ion/IonText.java +++ b/src/software/amazon/ion/IonText.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * Common functionality of Ion string and symbol diff --git a/src/com/amazon/ion/IonTextReader.java b/src/software/amazon/ion/IonTextReader.java similarity index 92% rename from src/com/amazon/ion/IonTextReader.java rename to src/software/amazon/ion/IonTextReader.java index 3a41c6cdda..73001e855c 100644 --- a/src/com/amazon/ion/IonTextReader.java +++ b/src/software/amazon/ion/IonTextReader.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.util.Spans; +import software.amazon.ion.util.Spans; /** * Extends {@link IonReader} with capabilites specialized to Ion text data diff --git a/src/com/amazon/ion/IonTimestamp.java b/src/software/amazon/ion/IonTimestamp.java similarity index 99% rename from src/com/amazon/ion/IonTimestamp.java rename to src/software/amazon/ion/IonTimestamp.java index 63bb78c5bc..e33d7a615e 100644 --- a/src/com/amazon/ion/IonTimestamp.java +++ b/src/software/amazon/ion/IonTimestamp.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigDecimal; import java.util.Date; diff --git a/src/com/amazon/ion/IonType.java b/src/software/amazon/ion/IonType.java similarity index 98% rename from src/com/amazon/ion/IonType.java rename to src/software/amazon/ion/IonType.java index 1a2e112168..2a33a6981c 100644 --- a/src/com/amazon/ion/IonType.java +++ b/src/software/amazon/ion/IonType.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/IonValue.java b/src/software/amazon/ion/IonValue.java similarity index 98% rename from src/com/amazon/ion/IonValue.java rename to src/software/amazon/ion/IonValue.java index 74e8285886..413e4274f4 100644 --- a/src/com/amazon/ion/IonValue.java +++ b/src/software/amazon/ion/IonValue.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.system.IonTextWriterBuilder; import java.util.Collections; import java.util.concurrent.CountDownLatch; @@ -447,7 +447,7 @@ public IonValue clone() * two strings returned by this method. *

* For more configurable rendering, see - * {@link com.amazon.ion.system.IonTextWriterBuilder}. + * {@link software.amazon.ion.system.IonTextWriterBuilder}. *

* This is not the correct way to retrieve the content of an * {@link IonString} or {@link IonSymbol}! @@ -505,7 +505,7 @@ public IonValue clone() * traverses the hierarchy, and as such it should be considered an * expensive operation. * - * @see com.amazon.ion.util.Equivalence + * @see software.amazon.ion.util.Equivalence * * @param other The value to compare with. * diff --git a/src/com/amazon/ion/IonWriter.java b/src/software/amazon/ion/IonWriter.java similarity index 98% rename from src/com/amazon/ion/IonWriter.java rename to src/software/amazon/ion/IonWriter.java index fe1e0e960d..eb9df9c8ec 100644 --- a/src/com/amazon/ion/IonWriter.java +++ b/src/software/amazon/ion/IonWriter.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.facet.Faceted; -import com.amazon.ion.system.IonTextWriterBuilder; -import com.amazon.ion.util.IonStreamUtils; +import software.amazon.ion.facet.Faceted; +import software.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.util.IonStreamUtils; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.Flushable; @@ -141,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 com.amazon.ion.system.IonWriterBuilder.IvmMinimizing + * {@link software.amazon.ion.system.IonWriterBuilder.IvmMinimizing * IvmMinimizing}.) *

* This feature can be used to flush reliably before writing more values. diff --git a/src/com/amazon/ion/NullValueException.java b/src/software/amazon/ion/NullValueException.java similarity index 97% rename from src/com/amazon/ion/NullValueException.java rename to src/software/amazon/ion/NullValueException.java index ac43f07e0b..dcc6caec8a 100644 --- a/src/com/amazon/ion/NullValueException.java +++ b/src/software/amazon/ion/NullValueException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/OffsetSpan.java b/src/software/amazon/ion/OffsetSpan.java similarity index 94% rename from src/com/amazon/ion/OffsetSpan.java rename to src/software/amazon/ion/OffsetSpan.java index 6ed135351b..85501b6f43 100644 --- a/src/com/amazon/ion/OffsetSpan.java +++ b/src/software/amazon/ion/OffsetSpan.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.facet.Faceted; -import com.amazon.ion.facet.Facets; +import software.amazon.ion.facet.Faceted; +import software.amazon.ion.facet.Facets; import java.io.InputStream; /** diff --git a/src/com/amazon/ion/RawValueSpanProvider.java b/src/software/amazon/ion/RawValueSpanProvider.java similarity index 98% rename from src/com/amazon/ion/RawValueSpanProvider.java rename to src/software/amazon/ion/RawValueSpanProvider.java index 5179d7eda7..92b3a14138 100644 --- a/src/com/amazon/ion/RawValueSpanProvider.java +++ b/src/software/amazon/ion/RawValueSpanProvider.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * Provide the ability to retrieve {@link Span}s (abstract value positions) diff --git a/src/com/amazon/ion/ReadOnlyValueException.java b/src/software/amazon/ion/ReadOnlyValueException.java similarity index 97% rename from src/com/amazon/ion/ReadOnlyValueException.java rename to src/software/amazon/ion/ReadOnlyValueException.java index daa3ed3763..581ebc8c4a 100644 --- a/src/com/amazon/ion/ReadOnlyValueException.java +++ b/src/software/amazon/ion/ReadOnlyValueException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/SeekableReader.java b/src/software/amazon/ion/SeekableReader.java similarity index 99% rename from src/com/amazon/ion/SeekableReader.java rename to src/software/amazon/ion/SeekableReader.java index 0603e6c4d8..7f62c8fa80 100644 --- a/src/com/amazon/ion/SeekableReader.java +++ b/src/software/amazon/ion/SeekableReader.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An {@link IonReader} facet providing the ability to retrieve diff --git a/src/com/amazon/ion/Span.java b/src/software/amazon/ion/Span.java similarity index 95% rename from src/com/amazon/ion/Span.java rename to src/software/amazon/ion/Span.java index c40bb6173e..115bfad251 100644 --- a/src/com/amazon/ion/Span.java +++ b/src/software/amazon/ion/Span.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.facet.Faceted; -import com.amazon.ion.util.Spans; +import software.amazon.ion.facet.Faceted; +import software.amazon.ion.util.Spans; /** * An immutable reference to a consecutive sequence of values (perhaps diff --git a/src/com/amazon/ion/SpanProvider.java b/src/software/amazon/ion/SpanProvider.java similarity index 98% rename from src/com/amazon/ion/SpanProvider.java rename to src/software/amazon/ion/SpanProvider.java index a506a6e719..d7ec075264 100644 --- a/src/com/amazon/ion/SpanProvider.java +++ b/src/software/amazon/ion/SpanProvider.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * Provide the ability to retrieve {@link Span}s (abstract value positions) diff --git a/src/com/amazon/ion/SubstituteSymbolTableException.java b/src/software/amazon/ion/SubstituteSymbolTableException.java similarity index 97% rename from src/com/amazon/ion/SubstituteSymbolTableException.java rename to src/software/amazon/ion/SubstituteSymbolTableException.java index 7472ec8657..c95d7af6fb 100644 --- a/src/com/amazon/ion/SubstituteSymbolTableException.java +++ b/src/software/amazon/ion/SubstituteSymbolTableException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An error caused by an operation that requires an exact match on an import diff --git a/src/com/amazon/ion/SymbolTable.java b/src/software/amazon/ion/SymbolTable.java similarity index 99% rename from src/com/amazon/ion/SymbolTable.java rename to src/software/amazon/ion/SymbolTable.java index e73e1da738..4828cfc65a 100644 --- a/src/com/amazon/ion/SymbolTable.java +++ b/src/software/amazon/ion/SymbolTable.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.io.IOException; import java.util.Iterator; diff --git a/src/com/amazon/ion/SymbolToken.java b/src/software/amazon/ion/SymbolToken.java similarity index 98% rename from src/com/amazon/ion/SymbolToken.java rename to src/software/amazon/ion/SymbolToken.java index a531823081..7f5fb7c797 100644 --- a/src/com/amazon/ion/SymbolToken.java +++ b/src/software/amazon/ion/SymbolToken.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/SystemSymbols.java b/src/software/amazon/ion/SystemSymbols.java similarity index 99% rename from src/com/amazon/ion/SystemSymbols.java rename to src/software/amazon/ion/SystemSymbols.java index 57d5745947..92c6ec0d9f 100644 --- a/src/com/amazon/ion/SystemSymbols.java +++ b/src/software/amazon/ion/SystemSymbols.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * Constants for symbols defined by the Ion specification. diff --git a/src/com/amazon/ion/TextSpan.java b/src/software/amazon/ion/TextSpan.java similarity index 95% rename from src/com/amazon/ion/TextSpan.java rename to src/software/amazon/ion/TextSpan.java index c81772913f..78c923ccf8 100644 --- a/src/com/amazon/ion/TextSpan.java +++ b/src/software/amazon/ion/TextSpan.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.facet.Faceted; -import com.amazon.ion.util.Spans; +import software.amazon.ion.facet.Faceted; +import software.amazon.ion.util.Spans; /** * Exposes the positions of a {@link Span} in the form of one-based diff --git a/src/com/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java similarity index 99% rename from src/com/amazon/ion/Timestamp.java rename to src/software/amazon/ion/Timestamp.java index 39df6e0827..4e6c4516cc 100644 --- a/src/com/amazon/ion/Timestamp.java +++ b/src/software/amazon/ion/Timestamp.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import static com.amazon.ion.impl._Private_Utils.safeEquals; -import static com.amazon.ion.util.IonTextUtils.printCodePointAsString; +import static software.amazon.ion.impl._Private_Utils.safeEquals; +import static software.amazon.ion.util.IonTextUtils.printCodePointAsString; -import com.amazon.ion.impl._Private_Utils; -import com.amazon.ion.util.IonTextUtils; +import software.amazon.ion.impl._Private_Utils; +import software.amazon.ion.util.IonTextUtils; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/com/amazon/ion/UnexpectedEofException.java b/src/software/amazon/ion/UnexpectedEofException.java similarity index 97% rename from src/com/amazon/ion/UnexpectedEofException.java rename to src/software/amazon/ion/UnexpectedEofException.java index 95280cb7a3..f0c8d353aa 100644 --- a/src/com/amazon/ion/UnexpectedEofException.java +++ b/src/software/amazon/ion/UnexpectedEofException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** diff --git a/src/com/amazon/ion/UnknownSymbolException.java b/src/software/amazon/ion/UnknownSymbolException.java similarity index 98% rename from src/com/amazon/ion/UnknownSymbolException.java rename to src/software/amazon/ion/UnknownSymbolException.java index 9cc7a50ec9..ea8a8f170b 100644 --- a/src/com/amazon/ion/UnknownSymbolException.java +++ b/src/software/amazon/ion/UnknownSymbolException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An error caused by a symbol ID that could not be translated into text diff --git a/src/com/amazon/ion/UnsupportedIonVersionException.java b/src/software/amazon/ion/UnsupportedIonVersionException.java similarity index 97% rename from src/com/amazon/ion/UnsupportedIonVersionException.java rename to src/software/amazon/ion/UnsupportedIonVersionException.java index 275381eee2..b9bab7a2de 100644 --- a/src/com/amazon/ion/UnsupportedIonVersionException.java +++ b/src/software/amazon/ion/UnsupportedIonVersionException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; /** * An error caused by a request for an Ion version that is not supported by diff --git a/src/com/amazon/ion/ValueFactory.java b/src/software/amazon/ion/ValueFactory.java similarity index 99% rename from src/com/amazon/ion/ValueFactory.java rename to src/software/amazon/ion/ValueFactory.java index a74f7c0f19..1f0006e794 100644 --- a/src/com/amazon/ion/ValueFactory.java +++ b/src/software/amazon/ion/ValueFactory.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/ValueVisitor.java b/src/software/amazon/ion/ValueVisitor.java similarity index 94% rename from src/com/amazon/ion/ValueVisitor.java rename to src/software/amazon/ion/ValueVisitor.java index 2aa3043dff..56967fcbe7 100644 --- a/src/com/amazon/ion/ValueVisitor.java +++ b/src/software/amazon/ion/ValueVisitor.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion; +package software.amazon.ion; -import com.amazon.ion.util.AbstractValueVisitor; +import software.amazon.ion.util.AbstractValueVisitor; /** * A Visitor for the Ion value hierarchy. diff --git a/src/com/amazon/ion/apps/BaseApp.java b/src/software/amazon/ion/apps/BaseApp.java similarity index 95% rename from src/com/amazon/ion/apps/BaseApp.java rename to src/software/amazon/ion/apps/BaseApp.java index d5890bb5ae..1f11460f17 100644 --- a/src/com/amazon/ion/apps/BaseApp.java +++ b/src/software/amazon/ion/apps/BaseApp.java @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.apps; + +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; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/com/amazon/ion/apps/EncodeApp.java b/src/software/amazon/ion/apps/EncodeApp.java similarity index 95% rename from src/com/amazon/ion/apps/EncodeApp.java rename to src/software/amazon/ion/apps/EncodeApp.java index 40045b6d43..ce83e99f2a 100644 --- a/src/com/amazon/ion/apps/EncodeApp.java +++ b/src/software/amazon/ion/apps/EncodeApp.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.apps; +package software.amazon.ion.apps; -import com.amazon.ion.IonBinaryWriter; -import com.amazon.ion.IonException; -import com.amazon.ion.IonReader; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.IonBinaryWriter; +import software.amazon.ion.IonException; +import software.amazon.ion.IonReader; +import software.amazon.ion.SymbolTable; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/com/amazon/ion/apps/PrintApp.java b/src/software/amazon/ion/apps/PrintApp.java similarity index 95% rename from src/com/amazon/ion/apps/PrintApp.java rename to src/software/amazon/ion/apps/PrintApp.java index ae9980e1a9..940422817e 100644 --- a/src/com/amazon/ion/apps/PrintApp.java +++ b/src/software/amazon/ion/apps/PrintApp.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.apps; +package software.amazon.ion.apps; -import com.amazon.ion.IonException; -import com.amazon.ion.IonReader; -import com.amazon.ion.IonSystem; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonException; +import software.amazon.ion.IonReader; +import software.amazon.ion.IonSystem; +import software.amazon.ion.IonWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/com/amazon/ion/apps/SymtabApp.java b/src/software/amazon/ion/apps/SymtabApp.java similarity index 96% rename from src/com/amazon/ion/apps/SymtabApp.java rename to src/software/amazon/ion/apps/SymtabApp.java index 63216a53b7..174c61c587 100644 --- a/src/com/amazon/ion/apps/SymtabApp.java +++ b/src/software/amazon/ion/apps/SymtabApp.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.apps; + +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; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; diff --git a/src/com/amazon/ion/facet/Faceted.java b/src/software/amazon/ion/facet/Faceted.java similarity index 98% rename from src/com/amazon/ion/facet/Faceted.java rename to src/software/amazon/ion/facet/Faceted.java index 087d821909..19b76db047 100644 --- a/src/com/amazon/ion/facet/Faceted.java +++ b/src/software/amazon/ion/facet/Faceted.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.facet; +package software.amazon.ion.facet; /** * Provides access to optional extension interfaces of a subject instance. diff --git a/src/com/amazon/ion/facet/Facets.java b/src/software/amazon/ion/facet/Facets.java similarity index 99% rename from src/com/amazon/ion/facet/Facets.java rename to src/software/amazon/ion/facet/Facets.java index ba5036dc70..dcc5359bd4 100644 --- a/src/com/amazon/ion/facet/Facets.java +++ b/src/software/amazon/ion/facet/Facets.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.facet; +package software.amazon.ion.facet; /** * Utility methods for working with facets. diff --git a/src/com/amazon/ion/facet/UnsupportedFacetException.java b/src/software/amazon/ion/facet/UnsupportedFacetException.java similarity index 97% rename from src/com/amazon/ion/facet/UnsupportedFacetException.java rename to src/software/amazon/ion/facet/UnsupportedFacetException.java index f8f807d618..f152d0204c 100644 --- a/src/com/amazon/ion/facet/UnsupportedFacetException.java +++ b/src/software/amazon/ion/facet/UnsupportedFacetException.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.facet; +package software.amazon.ion.facet; /** diff --git a/src/com/amazon/ion/facet/package-info.java b/src/software/amazon/ion/facet/package-info.java similarity index 92% rename from src/com/amazon/ion/facet/package-info.java rename to src/software/amazon/ion/facet/package-info.java index 1f05ee0161..08d54c33c8 100644 --- a/src/com/amazon/ion/facet/package-info.java +++ b/src/software/amazon/ion/facet/package-info.java @@ -37,7 +37,7 @@ * to support different sets of facets, based on its particular state. *

* The central focus of the pattern is the - * {@link com.amazon.ion.facet.Faceted#asFacet(Class)} method. + * {@link software.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. @@ -57,10 +57,10 @@ * especially when the subject is a decorator, adaptor, or similar wrapper * around the actual provider of the facet. *

- * Given a concrete {@link com.amazon.ion.facet.Faceted} class, it may be that + * Given a concrete {@link software.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 com.amazon.ion.facet.Faceted#asFacet asFacet} should choose whether + * {@link software.amazon.ion.facet.Faceted#asFacet asFacet} should choose whether * to return the facet based on the subject's state. * Such classes should not extend the facet interface (directly or * indirectly), since that allows clients to bypass {@code asfacet} and @@ -74,4 +74,4 @@ * Erich Gamma. It was primarily inspired by ISO C++ {@code locale} facets. * */ -package com.amazon.ion.facet; +package software.amazon.ion.facet; diff --git a/src/com/amazon/ion/impl/AppendableFastAppendable.java b/src/software/amazon/ion/impl/AppendableFastAppendable.java similarity index 96% rename from src/com/amazon/ion/impl/AppendableFastAppendable.java rename to src/software/amazon/ion/impl/AppendableFastAppendable.java index a7f2c1e8fc..6e011f5fb6 100644 --- a/src/com/amazon/ion/impl/AppendableFastAppendable.java +++ b/src/software/amazon/ion/impl/AppendableFastAppendable.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.util._Private_FastAppendable; import java.io.Closeable; import java.io.Flushable; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/Base64Encoder.java b/src/software/amazon/ion/impl/Base64Encoder.java similarity index 99% rename from src/com/amazon/ion/impl/Base64Encoder.java rename to src/software/amazon/ion/impl/Base64Encoder.java index ac01dcb575..ab9f6fed40 100644 --- a/src/com/amazon/ion/impl/Base64Encoder.java +++ b/src/software/amazon/ion/impl/Base64Encoder.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; /* * This is a class that supports encoding and decoding binary @@ -54,8 +54,8 @@ *

*/ -import com.amazon.ion.IonException; -import com.amazon.ion.util.IonTextUtils; +import software.amazon.ion.IonException; +import software.amazon.ion.util.IonTextUtils; import java.io.IOException; import java.io.InputStream; import java.io.Reader; diff --git a/src/com/amazon/ion/impl/BlockedBuffer.java b/src/software/amazon/ion/impl/BlockedBuffer.java similarity index 99% rename from src/com/amazon/ion/impl/BlockedBuffer.java rename to src/software/amazon/ion/impl/BlockedBuffer.java index 06bd00f4c3..a1824ac803 100644 --- a/src/com/amazon/ion/impl/BlockedBuffer.java +++ b/src/software/amazon/ion/impl/BlockedBuffer.java @@ -14,8 +14,8 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; -import com.amazon.ion.IonException; +package software.amazon.ion.impl; +import software.amazon.ion.IonException; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/ByteBuffer.java b/src/software/amazon/ion/impl/ByteBuffer.java similarity index 98% rename from src/com/amazon/ion/impl/ByteBuffer.java rename to src/software/amazon/ion/impl/ByteBuffer.java index 941ea7bf27..3a519091c2 100644 --- a/src/com/amazon/ion/impl/ByteBuffer.java +++ b/src/software/amazon/ion/impl/ByteBuffer.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/ByteReader.java b/src/software/amazon/ion/impl/ByteReader.java similarity index 98% rename from src/com/amazon/ion/impl/ByteReader.java rename to src/software/amazon/ion/impl/ByteReader.java index 3bf0e2a771..2c42b298d0 100644 --- a/src/com/amazon/ion/impl/ByteReader.java +++ b/src/software/amazon/ion/impl/ByteReader.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.Decimal; -import com.amazon.ion.Timestamp; +import software.amazon.ion.Decimal; +import software.amazon.ion.Timestamp; import java.io.IOException; /** * Interface to read bytes over a variety of sources. diff --git a/src/com/amazon/ion/impl/ByteWriter.java b/src/software/amazon/ion/impl/ByteWriter.java similarity index 98% rename from src/com/amazon/ion/impl/ByteWriter.java rename to src/software/amazon/ion/impl/ByteWriter.java index b1f9251aab..213d9d16cb 100644 --- a/src/com/amazon/ion/impl/ByteWriter.java +++ b/src/software/amazon/ion/impl/ByteWriter.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/DowncastingFaceted.java b/src/software/amazon/ion/impl/DowncastingFaceted.java similarity index 92% rename from src/com/amazon/ion/impl/DowncastingFaceted.java rename to src/software/amazon/ion/impl/DowncastingFaceted.java index 171f7b1f77..44f6cd3e5d 100644 --- a/src/com/amazon/ion/impl/DowncastingFaceted.java +++ b/src/software/amazon/ion/impl/DowncastingFaceted.java @@ -14,9 +14,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.facet.Faceted; +import software.amazon.ion.facet.Faceted; /** * Provides a simple implementation of {@link Faceted} diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/software/amazon/ion/impl/IonBinary.java similarity index 99% rename from src/com/amazon/ion/impl/IonBinary.java rename to src/software/amazon/ion/impl/IonBinary.java index 956d49212c..9bd644c24f 100644 --- a/src/com/amazon/ion/impl/IonBinary.java +++ b/src/software/amazon/ion/impl/IonBinary.java @@ -13,22 +13,22 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE; +import static software.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY; +import static software.amazon.ion.impl._Private_Utils.readFully; +import static software.amazon.ion.util.IonStreamUtils.isIonBinary; + +import software.amazon.ion.Decimal; +import software.amazon.ion.IonException; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; +import software.amazon.ion.Timestamp; +import software.amazon.ion.Timestamp.Precision; +import software.amazon.ion.UnexpectedEofException; +import software.amazon.ion.impl._Private_IonConstants.HighNibble; +import software.amazon.ion.util.IonTextUtils; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -2855,7 +2855,7 @@ else if (isNibbleZero(bd)) { /** - * @see com.amazon.ion.impl.lite.ReverseBinaryEncoder#writeIonDecimalContent + * @see software.amazon.ion.impl.lite.ReverseBinaryEncoder#writeIonDecimalContent */ public int writeDecimalContent(BigDecimal bd) throws IOException diff --git a/src/com/amazon/ion/impl/IonCharacterReader.java b/src/software/amazon/ion/impl/IonCharacterReader.java similarity index 99% rename from src/com/amazon/ion/impl/IonCharacterReader.java rename to src/software/amazon/ion/impl/IonCharacterReader.java index d4590c723f..b8a17121bb 100644 --- a/src/com/amazon/ion/impl/IonCharacterReader.java +++ b/src/software/amazon/ion/impl/IonCharacterReader.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; import java.io.PushbackReader; diff --git a/src/com/amazon/ion/impl/IonIteratorImpl.java b/src/software/amazon/ion/impl/IonIteratorImpl.java similarity index 94% rename from src/com/amazon/ion/impl/IonIteratorImpl.java rename to src/software/amazon/ion/impl/IonIteratorImpl.java index 2083575f07..3d6dca78b7 100644 --- a/src/com/amazon/ion/impl/IonIteratorImpl.java +++ b/src/software/amazon/ion/impl/IonIteratorImpl.java @@ -13,17 +13,17 @@ * 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; +package software.amazon.ion.impl; + +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; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/com/amazon/ion/impl/IonMessages.java b/src/software/amazon/ion/impl/IonMessages.java similarity index 95% rename from src/com/amazon/ion/impl/IonMessages.java rename to src/software/amazon/ion/impl/IonMessages.java index c34b11c3fb..2249551a78 100644 --- a/src/com/amazon/ion/impl/IonMessages.java +++ b/src/software/amazon/ion/impl/IonMessages.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; final class IonMessages diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java similarity index 98% rename from src/com/amazon/ion/impl/IonReaderBinaryRawX.java rename to src/software/amazon/ion/impl/IonReaderBinaryRawX.java index c5ece958f9..e162f2305a 100644 --- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java +++ b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java @@ -13,20 +13,20 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.SystemSymbols.ION_1_0_SID; + +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.UnifiedSavePointManagerX.SavePoint; +import software.amazon.ion.impl._Private_ScalarConversions.AS_TYPE; +import software.amazon.ion.impl._Private_ScalarConversions.ValueVariant; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java similarity index 95% rename from src/com/amazon/ion/impl/IonReaderBinarySystemX.java rename to src/software/amazon/ion/impl/IonReaderBinarySystemX.java index 840d8336a3..9e8d064c3d 100644 --- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java +++ b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java @@ -13,21 +13,21 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.IonType.SYMBOL; +import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID; + +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._Private_ScalarConversions.AS_TYPE; +import software.amazon.ion.impl._Private_ScalarConversions.ValueVariant; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java similarity index 93% rename from src/com/amazon/ion/impl/IonReaderBinaryUserX.java rename to src/software/amazon/ion/impl/IonReaderBinaryUserX.java index 31d3d775be..c849786a68 100644 --- a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java +++ b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java @@ -13,26 +13,26 @@ * 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; +package software.amazon.ion.impl; + +import software.amazon.ion.IonSystem; +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_SID; + +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonType; +import software.amazon.ion.OffsetSpan; +import software.amazon.ion.RawValueSpanProvider; +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.UnifiedInputStreamX.FromByteArray; +import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint; +import software.amazon.ion.impl._Private_ScalarConversions.AS_TYPE; import java.io.IOException; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java similarity index 98% rename from src/com/amazon/ion/impl/IonReaderTextRawTokensX.java rename to src/software/amazon/ion/impl/IonReaderTextRawTokensX.java index bdf3462fb4..dc704409d0 100644 --- a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java +++ b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java @@ -13,22 +13,22 @@ * permissions and limitations under the License. */ -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; +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; + +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; import java.io.IOException; /** diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/software/amazon/ion/impl/IonReaderTextRawX.java similarity index 98% rename from src/com/amazon/ion/impl/IonReaderTextRawX.java rename to src/software/amazon/ion/impl/IonReaderTextRawX.java index 437094c920..c6c8dfb35f 100644 --- a/src/com/amazon/ion/impl/IonReaderTextRawX.java +++ b/src/software/amazon/ion/impl/IonReaderTextRawX.java @@ -13,22 +13,22 @@ * permissions and limitations under the License. */ -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; +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; + +import software.amazon.ion.IonException; +import software.amazon.ion.IonTextReader; +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.UnifiedSavePointManagerX.SavePoint; +import software.amazon.ion.impl._Private_ScalarConversions.AS_TYPE; +import software.amazon.ion.impl._Private_ScalarConversions.ValueVariant; import java.io.IOException; import java.math.BigInteger; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/software/amazon/ion/impl/IonReaderTextSystemX.java similarity index 96% rename from src/com/amazon/ion/impl/IonReaderTextSystemX.java rename to src/software/amazon/ion/impl/IonReaderTextSystemX.java index 62b743a7b2..5c547fa3ea 100644 --- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java +++ b/src/software/amazon/ion/impl/IonReaderTextSystemX.java @@ -13,31 +13,31 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_ScalarConversions.getValueTypeName; + +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._Private_ScalarConversions.AS_TYPE; +import software.amazon.ion.impl._Private_ScalarConversions.CantConvertException; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonReaderTextUserX.java b/src/software/amazon/ion/impl/IonReaderTextUserX.java similarity index 95% rename from src/com/amazon/ion/impl/IonReaderTextUserX.java rename to src/software/amazon/ion/impl/IonReaderTextUserX.java index 1b0d0dcd7d..9d748ff0f9 100644 --- a/src/com/amazon/ion/impl/IonReaderTextUserX.java +++ b/src/software/amazon/ion/impl/IonReaderTextUserX.java @@ -13,22 +13,22 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.SystemSymbols.ION_1_0; +import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE; + +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; import java.util.regex.Pattern; /** diff --git a/src/com/amazon/ion/impl/IonReaderTreeSystem.java b/src/software/amazon/ion/impl/IonReaderTreeSystem.java similarity index 93% rename from src/com/amazon/ion/impl/IonReaderTreeSystem.java rename to src/software/amazon/ion/impl/IonReaderTreeSystem.java index f8a12181b0..baafc0024e 100644 --- a/src/com/amazon/ion/impl/IonReaderTreeSystem.java +++ b/src/software/amazon/ion/impl/IonReaderTreeSystem.java @@ -13,33 +13,33 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_Utils.readFully; + +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._Private_IonValue.SymbolTableProvider; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/IonReaderTreeUserX.java b/src/software/amazon/ion/impl/IonReaderTreeUserX.java similarity index 91% rename from src/com/amazon/ion/impl/IonReaderTreeUserX.java rename to src/software/amazon/ion/impl/IonReaderTreeUserX.java index 1ed1c31bfe..38e078ec87 100644 --- a/src/com/amazon/ion/impl/IonReaderTreeUserX.java +++ b/src/software/amazon/ion/impl/IonReaderTreeUserX.java @@ -13,23 +13,23 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; - -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; +package software.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 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 diff --git a/src/com/amazon/ion/impl/IonTextBufferedStream.java b/src/software/amazon/ion/impl/IonTextBufferedStream.java similarity index 99% rename from src/com/amazon/ion/impl/IonTextBufferedStream.java rename to src/software/amazon/ion/impl/IonTextBufferedStream.java index 2be9e8f4ab..b00c60a395 100644 --- a/src/com/amazon/ion/impl/IonTextBufferedStream.java +++ b/src/software/amazon/ion/impl/IonTextBufferedStream.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/IonTokenConstsX.java b/src/software/amazon/ion/impl/IonTokenConstsX.java similarity index 99% rename from src/com/amazon/ion/impl/IonTokenConstsX.java rename to src/software/amazon/ion/impl/IonTokenConstsX.java index c361606636..e6677df06b 100644 --- a/src/com/amazon/ion/impl/IonTokenConstsX.java +++ b/src/software/amazon/ion/impl/IonTokenConstsX.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonException; -import com.amazon.ion.IonType; -import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException; +import software.amazon.ion.IonException; +import software.amazon.ion.IonType; +import software.amazon.ion.impl._Private_ScalarConversions.CantConvertException; /** diff --git a/src/com/amazon/ion/impl/IonTokenReader.java b/src/software/amazon/ion/impl/IonTokenReader.java similarity index 98% rename from src/com/amazon/ion/impl/IonTokenReader.java rename to src/software/amazon/ion/impl/IonTokenReader.java index 34bf32f921..9f4c152758 100644 --- a/src/com/amazon/ion/impl/IonTokenReader.java +++ b/src/software/amazon/ion/impl/IonTokenReader.java @@ -13,19 +13,19 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.util.IonTextUtils.isDigit; +import static software.amazon.ion.util.IonTextUtils.isOperatorPart; +import static software.amazon.ion.util.IonTextUtils.isWhitespace; +import static software.amazon.ion.util.IonTextUtils.printCodePointAsString; + +import software.amazon.ion.Decimal; +import software.amazon.ion.IonException; +import software.amazon.ion.Timestamp; +import software.amazon.ion.UnexpectedEofException; +import software.amazon.ion.impl._Private_IonConstants.HighNibble; +import software.amazon.ion.util.IonTextUtils; import java.io.IOException; import java.io.PushbackReader; import java.io.Reader; diff --git a/src/com/amazon/ion/impl/IonUTF8.java b/src/software/amazon/ion/impl/IonUTF8.java similarity index 99% rename from src/com/amazon/ion/impl/IonUTF8.java rename to src/software/amazon/ion/impl/IonUTF8.java index 4b1c718bc0..ccd6563751 100644 --- a/src/com/amazon/ion/impl/IonUTF8.java +++ b/src/software/amazon/ion/impl/IonUTF8.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonException; +import software.amazon.ion.IonException; import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/software/amazon/ion/impl/IonWriterSystem.java similarity index 96% rename from src/com/amazon/ion/impl/IonWriterSystem.java rename to src/software/amazon/ion/impl/IonWriterSystem.java index 02890c0a85..d3e68a2605 100644 --- a/src/com/amazon/ion/impl/IonWriterSystem.java +++ b/src/software/amazon/ion/impl/IonWriterSystem.java @@ -13,20 +13,20 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; - -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID; +import static software.amazon.ion.impl._Private_Utils.newSymbolToken; +import static software.amazon.ion.impl._Private_Utils.newSymbolTokens; + +import software.amazon.ion.IonException; +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; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/IonWriterSystemBinary.java b/src/software/amazon/ion/impl/IonWriterSystemBinary.java similarity index 97% rename from src/com/amazon/ion/impl/IonWriterSystemBinary.java rename to src/software/amazon/ion/impl/IonWriterSystemBinary.java index 51073cfb31..d73010dbc2 100644 --- a/src/com/amazon/ion/impl/IonWriterSystemBinary.java +++ b/src/software/amazon/ion/impl/IonWriterSystemBinary.java @@ -13,22 +13,22 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_IonConstants.tidDATAGRAM; +import static software.amazon.ion.impl._Private_IonConstants.tidList; +import static software.amazon.ion.impl._Private_IonConstants.tidSexp; +import static software.amazon.ion.impl._Private_IonConstants.tidStruct; +import static software.amazon.ion.impl.lite._Private_LiteDomTrampoline.reverseEncode; + +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.BlockedBuffer.BlockedByteInputStream; +import software.amazon.ion.impl.IonBinary.BufferManager; +import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling; +import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; @@ -890,7 +890,7 @@ public void writeStringList(String[] values) throws IOException * 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)} + * This implements {@link software.amazon.ion.IonBinaryWriter#writeBytes(OutputStream)} * via our subclass {@link IonWriterBinaryCompatibility.System}. */ int writeBytes(OutputStream userstream) throws IOException { diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/software/amazon/ion/impl/IonWriterSystemText.java similarity index 96% rename from src/com/amazon/ion/impl/IonWriterSystemText.java rename to src/software/amazon/ion/impl/IonWriterSystemText.java index 0e78e95ccd..8eafb36b2e 100644 --- a/src/com/amazon/ion/impl/IonWriterSystemText.java +++ b/src/software/amazon/ion/impl/IonWriterSystemText.java @@ -13,23 +13,23 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.SystemSymbols.SYMBOLS; +import static software.amazon.ion.impl._Private_IonConstants.tidList; +import static software.amazon.ion.impl._Private_IonConstants.tidSexp; +import static software.amazon.ion.impl._Private_IonConstants.tidStruct; + +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.IonTextUtils.SymbolVariant; +import software.amazon.ion.util._Private_FastAppendable; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java b/src/software/amazon/ion/impl/IonWriterSystemTextMarkup.java similarity index 96% rename from src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java rename to src/software/amazon/ion/impl/IonWriterSystemTextMarkup.java index 0925429566..474e90e2ad 100644 --- a/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java +++ b/src/software/amazon/ion/impl/IonWriterSystemTextMarkup.java @@ -14,13 +14,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.IonType; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; +import software.amazon.ion.Timestamp; +import software.amazon.ion.util._Private_FastAppendable; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonWriterSystemTree.java b/src/software/amazon/ion/impl/IonWriterSystemTree.java similarity index 90% rename from src/com/amazon/ion/impl/IonWriterSystemTree.java rename to src/software/amazon/ion/impl/IonWriterSystemTree.java index ff3bf30d14..afab526a10 100644 --- a/src/com/amazon/ion/impl/IonWriterSystemTree.java +++ b/src/software/amazon/ion/impl/IonWriterSystemTree.java @@ -13,31 +13,31 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_Utils.valueIsLocalSymbolTable; + +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; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonWriterUser.java b/src/software/amazon/ion/impl/IonWriterUser.java similarity index 96% rename from src/com/amazon/ion/impl/IonWriterUser.java rename to src/software/amazon/ion/impl/IonWriterUser.java index 22acb7eac7..a4c66658a0 100644 --- a/src/com/amazon/ion/impl/IonWriterUser.java +++ b/src/software/amazon/ion/impl/IonWriterUser.java @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -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; -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE; +import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID; + +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; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/software/amazon/ion/impl/IonWriterUserBinary.java similarity index 95% rename from src/com/amazon/ion/impl/IonWriterUserBinary.java rename to src/software/amazon/ion/impl/IonWriterUserBinary.java index 8d9a7823dd..a505290e20 100644 --- a/src/com/amazon/ion/impl/IonWriterUserBinary.java +++ b/src/software/amazon/ion/impl/IonWriterUserBinary.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 static software.amazon.ion.impl._Private_Utils.isNonSymbolScalar; +import software.amazon.ion.IonReader; +import software.amazon.ion.IonType; +import software.amazon.ion.util.IonStreamUtils; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/software/amazon/ion/impl/LocalSymbolTable.java similarity index 96% rename from src/com/amazon/ion/impl/LocalSymbolTable.java rename to src/software/amazon/ion/impl/LocalSymbolTable.java index dde4bb8d67..fa7637366d 100644 --- a/src/com/amazon/ion/impl/LocalSymbolTable.java +++ b/src/software/amazon/ion/impl/LocalSymbolTable.java @@ -13,29 +13,29 @@ * permissions and limitations under the License. */ -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; +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._Private_Utils.copyOf; +import static software.amazon.ion.impl._Private_Utils.getSidForSymbolTableField; +import static software.amazon.ion.impl._Private_Utils.safeEquals; + +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; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java similarity index 92% rename from src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java rename to src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java index 3ac9e674ae..d0382a521b 100644 --- a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java +++ b/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java @@ -13,23 +13,23 @@ * permissions and limitations under the License. */ -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; +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 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; import java.util.ArrayList; import java.util.List; diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/software/amazon/ion/impl/LocalSymbolTableImports.java similarity index 98% rename from src/com/amazon/ion/impl/LocalSymbolTableImports.java rename to src/software/amazon/ion/impl/LocalSymbolTableImports.java index 3d9bfe7e58..30d87258e9 100644 --- a/src/com/amazon/ion/impl/LocalSymbolTableImports.java +++ b/src/software/amazon/ion/impl/LocalSymbolTableImports.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID; +import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID; -import com.amazon.ion.SymbolTable; -import com.amazon.ion.SymbolToken; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; import java.util.Arrays; import java.util.List; diff --git a/src/com/amazon/ion/impl/OutputStreamFastAppendable.java b/src/software/amazon/ion/impl/OutputStreamFastAppendable.java similarity index 97% rename from src/com/amazon/ion/impl/OutputStreamFastAppendable.java rename to src/software/amazon/ion/impl/OutputStreamFastAppendable.java index 9da49d08bf..864d7dc023 100644 --- a/src/com/amazon/ion/impl/OutputStreamFastAppendable.java +++ b/src/software/amazon/ion/impl/OutputStreamFastAppendable.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import static com.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar; +import static software.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.util._Private_FastAppendable; import java.io.Closeable; import java.io.Flushable; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/SharedSymbolTable.java b/src/software/amazon/ion/impl/SharedSymbolTable.java similarity index 95% rename from src/com/amazon/ion/impl/SharedSymbolTable.java rename to src/software/amazon/ion/impl/SharedSymbolTable.java index dedb85985f..364bfade5c 100644 --- a/src/com/amazon/ion/impl/SharedSymbolTable.java +++ b/src/software/amazon/ion/impl/SharedSymbolTable.java @@ -13,25 +13,25 @@ * permissions and limitations under the License. */ -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; +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._Private_Utils.getSidForSymbolTableField; + +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; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/amazon/ion/impl/SimpleByteBuffer.java b/src/software/amazon/ion/impl/SimpleByteBuffer.java similarity index 99% rename from src/com/amazon/ion/impl/SimpleByteBuffer.java rename to src/software/amazon/ion/impl/SimpleByteBuffer.java index 0eb06a97a4..ad5af9c9d2 100644 --- a/src/com/amazon/ion/impl/SimpleByteBuffer.java +++ b/src/software/amazon/ion/impl/SimpleByteBuffer.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.Decimal; +import software.amazon.ion.IonException; +import software.amazon.ion.Timestamp; +import software.amazon.ion.Timestamp.Precision; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/SubstituteSymbolTable.java b/src/software/amazon/ion/impl/SubstituteSymbolTable.java similarity index 95% rename from src/com/amazon/ion/impl/SubstituteSymbolTable.java rename to src/software/amazon/ion/impl/SubstituteSymbolTable.java index 368cfcc1ae..8db61713bb 100644 --- a/src/com/amazon/ion/impl/SubstituteSymbolTable.java +++ b/src/software/amazon/ion/impl/SubstituteSymbolTable.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.IonReader; +import software.amazon.ion.IonWriter; +import software.amazon.ion.ReadOnlyValueException; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; import java.io.IOException; import java.util.Collections; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/SymbolTableReader.java b/src/software/amazon/ion/impl/SymbolTableReader.java similarity index 97% rename from src/com/amazon/ion/impl/SymbolTableReader.java rename to src/software/amazon/ion/impl/SymbolTableReader.java index 08afa1fcbd..a76c3a7f46 100644 --- a/src/com/amazon/ion/impl/SymbolTableReader.java +++ b/src/software/amazon/ion/impl/SymbolTableReader.java @@ -13,33 +13,33 @@ * permissions and limitations under the License. */ -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; +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._Private_Utils.newSymbolToken; + +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; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/software/amazon/ion/impl/SymbolTokenImpl.java similarity index 91% rename from src/com/amazon/ion/impl/SymbolTokenImpl.java rename to src/software/amazon/ion/impl/SymbolTokenImpl.java index 91abb3b8b0..e2b4ad9130 100644 --- a/src/com/amazon/ion/impl/SymbolTokenImpl.java +++ b/src/software/amazon/ion/impl/SymbolTokenImpl.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import static com.amazon.ion.util.IonTextUtils.printString; +import static software.amazon.ion.util.IonTextUtils.printString; -import com.amazon.ion.SymbolToken; -import com.amazon.ion.UnknownSymbolException; +import software.amazon.ion.SymbolToken; +import software.amazon.ion.UnknownSymbolException; final class SymbolTokenImpl diff --git a/src/com/amazon/ion/impl/SystemValueIterator.java b/src/software/amazon/ion/impl/SystemValueIterator.java similarity index 91% rename from src/com/amazon/ion/impl/SystemValueIterator.java rename to src/software/amazon/ion/impl/SystemValueIterator.java index 452b4bd6da..104aaaf6e2 100644 --- a/src/com/amazon/ion/impl/SystemValueIterator.java +++ b/src/software/amazon/ion/impl/SystemValueIterator.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.IonCatalog; +import software.amazon.ion.IonSystem; +import software.amazon.ion.IonValue; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.impl.IonBinary.BufferManager; import java.io.Closeable; import java.io.IOException; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/UnifiedDataPageX.java b/src/software/amazon/ion/impl/UnifiedDataPageX.java similarity index 99% rename from src/com/amazon/ion/impl/UnifiedDataPageX.java rename to src/software/amazon/ion/impl/UnifiedDataPageX.java index 769f4933d4..546b02f8cb 100644 --- a/src/com/amazon/ion/impl/UnifiedDataPageX.java +++ b/src/software/amazon/ion/impl/UnifiedDataPageX.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/UnifiedInputBufferX.java b/src/software/amazon/ion/impl/UnifiedInputBufferX.java similarity index 99% rename from src/com/amazon/ion/impl/UnifiedInputBufferX.java rename to src/software/amazon/ion/impl/UnifiedInputBufferX.java index c8444883cb..c1c54b1fb0 100644 --- a/src/com/amazon/ion/impl/UnifiedInputBufferX.java +++ b/src/software/amazon/ion/impl/UnifiedInputBufferX.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; abstract class UnifiedInputBufferX diff --git a/src/com/amazon/ion/impl/UnifiedInputStreamX.java b/src/software/amazon/ion/impl/UnifiedInputStreamX.java similarity index 99% rename from src/com/amazon/ion/impl/UnifiedInputStreamX.java rename to src/software/amazon/ion/impl/UnifiedInputStreamX.java index f962946191..94d14ef28a 100644 --- a/src/com/amazon/ion/impl/UnifiedInputStreamX.java +++ b/src/software/amazon/ion/impl/UnifiedInputStreamX.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException; -import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint; +import software.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException; +import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint; import java.io.Closeable; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/UnifiedSavePointManagerX.java b/src/software/amazon/ion/impl/UnifiedSavePointManagerX.java similarity index 99% rename from src/com/amazon/ion/impl/UnifiedSavePointManagerX.java rename to src/software/amazon/ion/impl/UnifiedSavePointManagerX.java index aa8bddf0de..9de5276988 100644 --- a/src/com/amazon/ion/impl/UnifiedSavePointManagerX.java +++ b/src/software/amazon/ion/impl/UnifiedSavePointManagerX.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; /** diff --git a/src/com/amazon/ion/impl/_Private_ByteTransferReader.java b/src/software/amazon/ion/impl/_Private_ByteTransferReader.java similarity index 83% rename from src/com/amazon/ion/impl/_Private_ByteTransferReader.java rename to src/software/amazon/ion/impl/_Private_ByteTransferReader.java index b1b9d95d35..497928e855 100644 --- a/src/com/amazon/ion/impl/_Private_ByteTransferReader.java +++ b/src/software/amazon/ion/impl/_Private_ByteTransferReader.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonReader; +import software.amazon.ion.IonReader; import java.io.IOException; /** - * An {@link IonReader} {@linkplain com.amazon.ion.facet facet} that can rapidly bulk-copy + * An {@link IonReader} {@linkplain software.amazon.ion.facet facet} that can rapidly bulk-copy * Ion binary data under certain circumstances. */ public interface _Private_ByteTransferReader diff --git a/src/com/amazon/ion/impl/_Private_ByteTransferSink.java b/src/software/amazon/ion/impl/_Private_ByteTransferSink.java similarity index 97% rename from src/com/amazon/ion/impl/_Private_ByteTransferSink.java rename to src/software/amazon/ion/impl/_Private_ByteTransferSink.java index 1f26745e49..40cb76af50 100644 --- a/src/com/amazon/ion/impl/_Private_ByteTransferSink.java +++ b/src/software/amazon/ion/impl/_Private_ByteTransferSink.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/_Private_CallbackBuilder.java b/src/software/amazon/ion/impl/_Private_CallbackBuilder.java similarity index 91% rename from src/com/amazon/ion/impl/_Private_CallbackBuilder.java rename to src/software/amazon/ion/impl/_Private_CallbackBuilder.java index 2184d87829..7d8e9c523f 100644 --- a/src/com/amazon/ion/impl/_Private_CallbackBuilder.java +++ b/src/software/amazon/ion/impl/_Private_CallbackBuilder.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.util._Private_FastAppendable; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_CommandLine.java b/src/software/amazon/ion/impl/_Private_CommandLine.java similarity index 95% rename from src/com/amazon/ion/impl/_Private_CommandLine.java rename to src/software/amazon/ion/impl/_Private_CommandLine.java index 902b327d67..bf5168b025 100644 --- a/src/com/amazon/ion/impl/_Private_CommandLine.java +++ b/src/software/amazon/ion/impl/_Private_CommandLine.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.util.JarInfo; import java.io.IOException; /** diff --git a/src/com/amazon/ion/impl/_Private_CurriedValueFactory.java b/src/software/amazon/ion/impl/_Private_CurriedValueFactory.java similarity index 91% rename from src/com/amazon/ion/impl/_Private_CurriedValueFactory.java rename to src/software/amazon/ion/impl/_Private_CurriedValueFactory.java index eb492f5dc7..856d4b7702 100644 --- a/src/com/amazon/ion/impl/_Private_CurriedValueFactory.java +++ b/src/software/amazon/ion/impl/_Private_CurriedValueFactory.java @@ -13,29 +13,29 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +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.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; diff --git a/src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java b/src/software/amazon/ion/impl/_Private_FastAppendableDecorator.java similarity index 96% rename from src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java rename to src/software/amazon/ion/impl/_Private_FastAppendableDecorator.java index ac1246e4de..3b83684ff0 100644 --- a/src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java +++ b/src/software/amazon/ion/impl/_Private_FastAppendableDecorator.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.util._Private_FastAppendable; import java.io.Closeable; import java.io.Flushable; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java b/src/software/amazon/ion/impl/_Private_FastAppendableTrampoline.java similarity index 92% rename from src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java rename to src/software/amazon/ion/impl/_Private_FastAppendableTrampoline.java index 4440c889d6..d7b3230839 100644 --- a/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java +++ b/src/software/amazon/ion/impl/_Private_FastAppendableTrampoline.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.util._Private_FastAppendable; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/software/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java similarity index 93% rename from src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java rename to src/software/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java index c92da72b29..2f318cc793 100644 --- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java +++ b/src/software/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java @@ -13,23 +13,23 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_Utils.initialSymtab; + +import software.amazon.ion.IonBinaryWriter; +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.BlockedBuffer.BufferedOutputStream; +import software.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder; +import software.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder.AllocatorMode; +import software.amazon.ion.system.IonBinaryWriterBuilder; +import software.amazon.ion.system.IonSystemBuilder; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java b/src/software/amazon/ion/impl/_Private_IonBinaryWriterImpl.java similarity index 90% rename from src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java rename to src/software/amazon/ion/impl/_Private_IonBinaryWriterImpl.java index a5570866a9..0e3daecb6a 100644 --- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java +++ b/src/software/amazon/ion/impl/_Private_IonBinaryWriterImpl.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.IonBinaryWriter; +import software.amazon.ion.IonException; +import software.amazon.ion.IonWriter; +import software.amazon.ion.impl.BlockedBuffer.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/_Private_IonConstants.java b/src/software/amazon/ion/impl/_Private_IonConstants.java similarity index 99% rename from src/com/amazon/ion/impl/_Private_IonConstants.java rename to src/software/amazon/ion/impl/_Private_IonConstants.java index 38b9b1ee97..bdd8130552 100644 --- a/src/com/amazon/ion/impl/_Private_IonConstants.java +++ b/src/software/amazon/ion/impl/_Private_IonConstants.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonException; +import software.amazon.ion.IonException; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_IonContainer.java b/src/software/amazon/ion/impl/_Private_IonContainer.java similarity index 88% rename from src/com/amazon/ion/impl/_Private_IonContainer.java rename to src/software/amazon/ion/impl/_Private_IonContainer.java index a77ab51a81..b266ec18e0 100644 --- a/src/com/amazon/ion/impl/_Private_IonContainer.java +++ b/src/software/amazon/ion/impl/_Private_IonContainer.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonContainer; -import com.amazon.ion.IonValue; +import software.amazon.ion.IonContainer; +import software.amazon.ion.IonValue; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_IonDatagram.java b/src/software/amazon/ion/impl/_Private_IonDatagram.java similarity index 87% rename from src/com/amazon/ion/impl/_Private_IonDatagram.java rename to src/software/amazon/ion/impl/_Private_IonDatagram.java index 2a9f15f5c5..3869a53dae 100644 --- a/src/com/amazon/ion/impl/_Private_IonDatagram.java +++ b/src/software/amazon/ion/impl/_Private_IonDatagram.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonDatagram; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.IonDatagram; +import software.amazon.ion.SymbolTable; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/software/amazon/ion/impl/_Private_IonReaderFactory.java similarity index 95% rename from src/com/amazon/ion/impl/_Private_IonReaderFactory.java rename to src/software/amazon/ion/impl/_Private_IonReaderFactory.java index 8239e3ff50..c311d42427 100644 --- a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java +++ b/src/software/amazon/ion/impl/_Private_IonReaderFactory.java @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -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.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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl.UnifiedInputStreamX.makeStream; +import static software.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE; +import static software.amazon.ion.util.IonStreamUtils.isIonBinary; + +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonException; +import software.amazon.ion.IonReader; +import software.amazon.ion.IonSystem; +import software.amazon.ion.IonTextReader; +import software.amazon.ion.IonValue; +import software.amazon.ion.util.IonStreamUtils; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/_Private_IonSymbol.java b/src/software/amazon/ion/impl/_Private_IonSymbol.java similarity index 85% rename from src/com/amazon/ion/impl/_Private_IonSymbol.java rename to src/software/amazon/ion/impl/_Private_IonSymbol.java index 6e0dbc1cd6..37de9f9845 100644 --- a/src/com/amazon/ion/impl/_Private_IonSymbol.java +++ b/src/software/amazon/ion/impl/_Private_IonSymbol.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonSymbol; -import com.amazon.ion.SymbolToken; -import com.amazon.ion.impl._Private_IonValue.SymbolTableProvider; +import software.amazon.ion.IonSymbol; +import software.amazon.ion.SymbolToken; +import software.amazon.ion.impl._Private_IonValue.SymbolTableProvider; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_IonSystem.java b/src/software/amazon/ion/impl/_Private_IonSystem.java similarity index 85% rename from src/com/amazon/ion/impl/_Private_IonSystem.java rename to src/software/amazon/ion/impl/_Private_IonSystem.java index d9024761f8..41323e4c70 100644 --- a/src/com/amazon/ion/impl/_Private_IonSystem.java +++ b/src/software/amazon/ion/impl/_Private_IonSystem.java @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl; + +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; import java.io.InputStream; import java.io.Reader; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/software/amazon/ion/impl/_Private_IonTextAppender.java similarity index 98% rename from src/com/amazon/ion/impl/_Private_IonTextAppender.java rename to src/software/amazon/ion/impl/_Private_IonTextAppender.java index 4e6f952615..5359f1f046 100644 --- a/src/com/amazon/ion/impl/_Private_IonTextAppender.java +++ b/src/software/amazon/ion/impl/_Private_IonTextAppender.java @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -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 static software.amazon.ion.impl._Private_IonConstants.MAX_LONG_TEXT_SIZE; +import static software.amazon.ion.impl._Private_IonConstants.isHighSurrogate; +import static software.amazon.ion.impl._Private_IonConstants.isLowSurrogate; +import static software.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 software.amazon.ion.Decimal; +import software.amazon.ion.impl.Base64Encoder.TextStream; +import software.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.util._Private_FastAppendable; import java.io.ByteArrayInputStream; import java.io.Closeable; import java.io.Flushable; diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/software/amazon/ion/impl/_Private_IonTextWriterBuilder.java similarity index 94% rename from src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java rename to src/software/amazon/ion/impl/_Private_IonTextWriterBuilder.java index 5c94c62556..d064cf46fe 100644 --- a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java +++ b/src/software/amazon/ion/impl/_Private_IonTextWriterBuilder.java @@ -13,18 +13,18 @@ * 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; +package software.amazon.ion.impl; + +import static software.amazon.ion.impl._Private_Utils.initialSymtab; + +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._Private_FastAppendable; import java.io.OutputStream; /** diff --git a/src/com/amazon/ion/impl/_Private_IonValue.java b/src/software/amazon/ion/impl/_Private_IonValue.java similarity index 94% rename from src/com/amazon/ion/impl/_Private_IonValue.java rename to src/software/amazon/ion/impl/_Private_IonValue.java index c81648e350..2cc545074e 100644 --- a/src/com/amazon/ion/impl/_Private_IonValue.java +++ b/src/software/amazon/ion/impl/_Private_IonValue.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonDatagram; -import com.amazon.ion.IonValue; -import com.amazon.ion.SymbolTable; -import com.amazon.ion.SymbolToken; +import software.amazon.ion.IonDatagram; +import software.amazon.ion.IonValue; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; import java.io.PrintWriter; /** diff --git a/src/com/amazon/ion/impl/_Private_IonWriter.java b/src/software/amazon/ion/impl/_Private_IonWriter.java similarity index 92% rename from src/com/amazon/ion/impl/_Private_IonWriter.java rename to src/software/amazon/ion/impl/_Private_IonWriter.java index 519a14f3d1..beb5a3a7b0 100644 --- a/src/com/amazon/ion/impl/_Private_IonWriter.java +++ b/src/software/amazon/ion/impl/_Private_IonWriter.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonCatalog; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonWriter; import java.io.IOException; /** @@ -60,6 +60,6 @@ public interface _Private_IonWriter */ void writeIonVersionMarker() throws IOException; - /** Indicates whether the writer is stream copy optimized through {@link #writeValue(com.amazon.ion.IonReader)}. */ + /** Indicates whether the writer is stream copy optimized through {@link #writeValue(software.amazon.ion.IonReader)}. */ public boolean isStreamCopyOptimized(); } diff --git a/src/com/amazon/ion/impl/_Private_IonWriterBase.java b/src/software/amazon/ion/impl/_Private_IonWriterBase.java similarity index 97% rename from src/com/amazon/ion/impl/_Private_IonWriterBase.java rename to src/software/amazon/ion/impl/_Private_IonWriterBase.java index 82802d938a..009212633b 100644 --- a/src/com/amazon/ion/impl/_Private_IonWriterBase.java +++ b/src/software/amazon/ion/impl/_Private_IonWriterBase.java @@ -13,16 +13,16 @@ * 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.IonWriter; -import com.amazon.ion.SymbolTable; -import com.amazon.ion.SymbolToken; -import com.amazon.ion.Timestamp; -import com.amazon.ion.UnknownSymbolException; +package software.amazon.ion.impl; + +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.Timestamp; +import software.amazon.ion.UnknownSymbolException; import java.io.IOException; import java.math.BigDecimal; import java.util.Date; diff --git a/src/com/amazon/ion/impl/_Private_IonWriterFactory.java b/src/software/amazon/ion/impl/_Private_IonWriterFactory.java similarity index 88% rename from src/com/amazon/ion/impl/_Private_IonWriterFactory.java rename to src/software/amazon/ion/impl/_Private_IonWriterFactory.java index b02b8dfc94..7e265be510 100644 --- a/src/com/amazon/ion/impl/_Private_IonWriterFactory.java +++ b/src/software/amazon/ion/impl/_Private_IonWriterFactory.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -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; +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; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_ListWriter.java b/src/software/amazon/ion/impl/_Private_ListWriter.java similarity index 94% rename from src/com/amazon/ion/impl/_Private_ListWriter.java rename to src/software/amazon/ion/impl/_Private_ListWriter.java index 71eb97c1a8..d1bdef17e1 100644 --- a/src/com/amazon/ion/impl/_Private_ListWriter.java +++ b/src/software/amazon/ion/impl/_Private_ListWriter.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonWriter; import java.io.IOException; /** diff --git a/src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java b/src/software/amazon/ion/impl/_Private_LocalSymbolTableFactory.java similarity index 94% rename from src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java rename to src/software/amazon/ion/impl/_Private_LocalSymbolTableFactory.java index ad6c5f47c4..b224583f3b 100644 --- a/src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java +++ b/src/software/amazon/ion/impl/_Private_LocalSymbolTableFactory.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonCatalog; -import com.amazon.ion.IonReader; -import com.amazon.ion.IonType; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonReader; +import software.amazon.ion.IonType; +import software.amazon.ion.SymbolTable; /** * NOT FOR APPLICATION USE diff --git a/src/com/amazon/ion/impl/_Private_MarkupCallback.java b/src/software/amazon/ion/impl/_Private_MarkupCallback.java similarity index 98% rename from src/com/amazon/ion/impl/_Private_MarkupCallback.java rename to src/software/amazon/ion/impl/_Private_MarkupCallback.java index dabbd4e205..aa5017a57d 100644 --- a/src/com/amazon/ion/impl/_Private_MarkupCallback.java +++ b/src/software/amazon/ion/impl/_Private_MarkupCallback.java @@ -14,13 +14,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonType; -import com.amazon.ion.SymbolToken; +import software.amazon.ion.IonType; +import software.amazon.ion.SymbolToken; -import com.amazon.ion.system.IonTextWriterBuilder; -import com.amazon.ion.util._Private_FastAppendable; +import software.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.util._Private_FastAppendable; import java.io.IOException; /** diff --git a/src/com/amazon/ion/impl/_Private_ReaderWriter.java b/src/software/amazon/ion/impl/_Private_ReaderWriter.java similarity index 90% rename from src/com/amazon/ion/impl/_Private_ReaderWriter.java rename to src/software/amazon/ion/impl/_Private_ReaderWriter.java index aa91f56298..d1e398f999 100644 --- a/src/com/amazon/ion/impl/_Private_ReaderWriter.java +++ b/src/software/amazon/ion/impl/_Private_ReaderWriter.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolTable; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/impl/_Private_ScalarConversions.java b/src/software/amazon/ion/impl/_Private_ScalarConversions.java similarity index 99% rename from src/com/amazon/ion/impl/_Private_ScalarConversions.java rename to src/software/amazon/ion/impl/_Private_ScalarConversions.java index b5cf96aa5b..35e632077d 100644 --- a/src/com/amazon/ion/impl/_Private_ScalarConversions.java +++ b/src/software/amazon/ion/impl/_Private_ScalarConversions.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.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 software.amazon.ion.Decimal; +import software.amazon.ion.IntegerSize; +import software.amazon.ion.IonException; +import software.amazon.ion.IonType; +import software.amazon.ion.Timestamp; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; diff --git a/src/com/amazon/ion/impl/_Private_SymbolToken.java b/src/software/amazon/ion/impl/_Private_SymbolToken.java similarity index 92% rename from src/com/amazon/ion/impl/_Private_SymbolToken.java rename to src/software/amazon/ion/impl/_Private_SymbolToken.java index 5a2f5930bc..57ff6cb85d 100644 --- a/src/com/amazon/ion/impl/_Private_SymbolToken.java +++ b/src/software/amazon/ion/impl/_Private_SymbolToken.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.SymbolToken; +import software.amazon.ion.SymbolToken; public interface _Private_SymbolToken extends SymbolToken{ diff --git a/src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java b/src/software/amazon/ion/impl/_Private_SymtabExtendsCache.java similarity index 93% rename from src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java rename to src/software/amazon/ion/impl/_Private_SymtabExtendsCache.java index 1fc47c9572..b50fe3ca06 100644 --- a/src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java +++ b/src/software/amazon/ion/impl/_Private_SymtabExtendsCache.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import static com.amazon.ion.impl._Private_Utils.symtabExtends; +import static software.amazon.ion.impl._Private_Utils.symtabExtends; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolTable; /** * Cache to reduce unnecessary calls to diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/software/amazon/ion/impl/_Private_Utils.java similarity index 96% rename from src/com/amazon/ion/impl/_Private_Utils.java rename to src/software/amazon/ion/impl/_Private_Utils.java index 62785fa277..d73e55d17e 100644 --- a/src/com/amazon/ion/impl/_Private_Utils.java +++ b/src/software/amazon/ion/impl/_Private_Utils.java @@ -13,35 +13,35 @@ * permissions and limitations under the License. */ -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; +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; + +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; +import software.amazon.ion.impl.IonBinary.BufferManager; +import software.amazon.ion.impl.IonBinary.Reader; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/_Private_ValueFactory.java b/src/software/amazon/ion/impl/_Private_ValueFactory.java similarity index 90% rename from src/com/amazon/ion/impl/_Private_ValueFactory.java rename to src/software/amazon/ion/impl/_Private_ValueFactory.java index 304123f99b..bc214687ba 100644 --- a/src/com/amazon/ion/impl/_Private_ValueFactory.java +++ b/src/software/amazon/ion/impl/_Private_ValueFactory.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl; +package software.amazon.ion.impl; -import com.amazon.ion.IonStruct; -import com.amazon.ion.ValueFactory; +import software.amazon.ion.IonStruct; +import software.amazon.ion.ValueFactory; public interface _Private_ValueFactory extends ValueFactory { diff --git a/src/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/software/amazon/ion/impl/bin/AbstractIonWriter.java similarity index 91% rename from src/com/amazon/ion/impl/bin/AbstractIonWriter.java rename to src/software/amazon/ion/impl/bin/AbstractIonWriter.java index 0fe57ed210..77272a0ed3 100644 --- a/src/com/amazon/ion/impl/bin/AbstractIonWriter.java +++ b/src/software/amazon/ion/impl/bin/AbstractIonWriter.java @@ -13,21 +13,21 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.bin; + +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._Private_ByteTransferReader; +import software.amazon.ion.impl._Private_ByteTransferSink; +import software.amazon.ion.impl._Private_IonWriter; +import software.amazon.ion.impl._Private_SymtabExtendsCache; +import software.amazon.ion.impl._Private_Utils; import java.io.IOException; import java.math.BigInteger; import java.util.Date; diff --git a/src/com/amazon/ion/impl/bin/AbstractSymbolTable.java b/src/software/amazon/ion/impl/bin/AbstractSymbolTable.java similarity index 81% rename from src/com/amazon/ion/impl/bin/AbstractSymbolTable.java rename to src/software/amazon/ion/impl/bin/AbstractSymbolTable.java index a014440c57..ffb7db679c 100644 --- a/src/com/amazon/ion/impl/bin/AbstractSymbolTable.java +++ b/src/software/amazon/ion/impl/bin/AbstractSymbolTable.java @@ -13,22 +13,22 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.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 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; +import software.amazon.ion.IonWriter; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; import java.io.IOException; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/bin/Block.java b/src/software/amazon/ion/impl/bin/Block.java similarity index 98% rename from src/com/amazon/ion/impl/bin/Block.java rename to src/software/amazon/ion/impl/bin/Block.java index 9f03d2c252..857274627b 100644 --- a/src/com/amazon/ion/impl/bin/Block.java +++ b/src/software/amazon/ion/impl/bin/Block.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; import java.io.Closeable; diff --git a/src/com/amazon/ion/impl/bin/BlockAllocator.java b/src/software/amazon/ion/impl/bin/BlockAllocator.java similarity index 97% rename from src/com/amazon/ion/impl/bin/BlockAllocator.java rename to src/software/amazon/ion/impl/bin/BlockAllocator.java index fe6cf1bb13..d67621035b 100644 --- a/src/com/amazon/ion/impl/bin/BlockAllocator.java +++ b/src/software/amazon/ion/impl/bin/BlockAllocator.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; import java.io.Closeable; diff --git a/src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java b/src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java similarity index 97% rename from src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java rename to src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java index 8e6ee59691..10d83b5f22 100644 --- a/src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java +++ b/src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; /** * Constructs {@link BlockAllocator} instances. Such instances returned by {@link #vendAllocator(int)} diff --git a/src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java b/src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java similarity index 98% rename from src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java rename to src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java index d9a17423e4..0637bc8fd9 100644 --- a/src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java +++ b/src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; /** * Utility implementations of {@link BlockAllocatorProvider}. diff --git a/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java b/src/software/amazon/ion/impl/bin/IonBinaryWriterAdapter.java similarity index 94% rename from src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java rename to src/software/amazon/ion/impl/bin/IonBinaryWriterAdapter.java index 3a5f3e9abf..cc83572a58 100644 --- a/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java +++ b/src/software/amazon/ion/impl/bin/IonBinaryWriterAdapter.java @@ -13,16 +13,16 @@ * 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; +package software.amazon.ion.impl.bin; + +import software.amazon.ion.IonBinaryWriter; +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.Timestamp; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java similarity index 96% rename from src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java rename to src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java index e898f2a16a..005d97be2e 100644 --- a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java +++ b/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java @@ -13,32 +13,32 @@ * permissions and limitations under the License. */ -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; +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_MAX_ID; +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 static java.util.Collections.unmodifiableList; -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 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.bin.IonRawBinaryWriter.StreamCloseMode; +import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java similarity index 97% rename from src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java rename to src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java index 23ced039c6..f9ddde75fd 100644 --- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java +++ b/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java @@ -13,39 +13,39 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.bin; + +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_1_0_SID; +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 static java.lang.Double.doubleToRawLongBits; import static java.lang.Float.floatToRawIntBits; -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 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; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java similarity index 98% rename from src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java rename to src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java index 831cb4d2ce..2adcbb335e 100644 --- a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java +++ b/src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/com/amazon/ion/impl/bin/Symbols.java b/src/software/amazon/ion/impl/bin/Symbols.java similarity index 86% rename from src/com/amazon/ion/impl/bin/Symbols.java rename to src/software/amazon/ion/impl/bin/Symbols.java index 77540c9ae7..f9fa3c3a5a 100644 --- a/src/com/amazon/ion/impl/bin/Symbols.java +++ b/src/software/amazon/ion/impl/bin/Symbols.java @@ -13,34 +13,34 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.bin; + +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 static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; import static java.util.Collections.unmodifiableMap; -import com.amazon.ion.IonException; -import com.amazon.ion.SymbolTable; -import com.amazon.ion.SymbolToken; +import software.amazon.ion.IonException; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolToken; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/software/amazon/ion/impl/bin/WriteBuffer.java similarity index 99% rename from src/com/amazon/ion/impl/bin/WriteBuffer.java rename to src/software/amazon/ion/impl/bin/WriteBuffer.java index e3973c56e4..2aed81e800 100644 --- a/src/com/amazon/ion/impl/bin/WriteBuffer.java +++ b/src/software/amazon/ion/impl/bin/WriteBuffer.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; import java.io.Closeable; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/software/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java similarity index 95% rename from src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java rename to src/software/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java index a54da159a1..f787cac8ed 100644 --- a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java +++ b/src/software/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java b/src/software/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java similarity index 90% rename from src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java rename to src/software/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java index 8c1dd6aab9..af920c0067 100644 --- a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java +++ b/src/software/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java @@ -13,23 +13,23 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; - -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; +package software.amazon.ion.impl.bin; + +import static software.amazon.ion.impl.bin.IonManagedBinaryWriter.ONLY_SYSTEM_IMPORTS; + +import software.amazon.ion.IonBinaryWriter; +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonException; +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.IonBinaryWriterAdapter.Factory; +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; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java b/src/software/amazon/ion/impl/bin/_Private_IonManagedWriter.java similarity index 97% rename from src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java rename to src/software/amazon/ion/impl/bin/_Private_IonManagedWriter.java index b836315bae..53378154b1 100644 --- a/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java +++ b/src/software/amazon/ion/impl/bin/_Private_IonManagedWriter.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonWriter; import java.io.IOException; /** diff --git a/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java b/src/software/amazon/ion/impl/bin/_Private_IonRawWriter.java similarity index 97% rename from src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java rename to src/software/amazon/ion/impl/bin/_Private_IonRawWriter.java index 23ac04186e..28e1a1d4bd 100644 --- a/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java +++ b/src/software/amazon/ion/impl/bin/_Private_IonRawWriter.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.bin; +package software.amazon.ion.impl.bin; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonWriter; import java.io.IOException; /** diff --git a/src/software/amazon/ion/impl/bin/package-info.java b/src/software/amazon/ion/impl/bin/package-info.java new file mode 100644 index 0000000000..6fdf58d908 --- /dev/null +++ b/src/software/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 software.amazon.ion.IonWriter}. + * + *

+ * 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._Private_IonManagedBinaryWriterBuilder} which builds instances of + * {@link software.amazon.ion.impl.bin.IonManagedBinaryWriter}. See the below section for what Managed means + * in this context. + * + *

Block API

+ * 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. + *

+ * 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. + *

+ * 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. + * + *

Raw Binary Ion Writer

+ * 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 sub-field encodings (e.g. VarInt, VarUInt, and UTF-8). + * + *

Managed Binary Ion Writer

+ * 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/com/amazon/ion/impl/lite/ContainerlessContext.java b/src/software/amazon/ion/impl/lite/ContainerlessContext.java similarity index 95% rename from src/com/amazon/ion/impl/lite/ContainerlessContext.java rename to src/software/amazon/ion/impl/lite/ContainerlessContext.java index f71fb21726..cbe07794b1 100644 --- a/src/com/amazon/ion/impl/lite/ContainerlessContext.java +++ b/src/software/amazon/ion/impl/lite/ContainerlessContext.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolTable; /** * Context for IonValues that are not contained in any Container or Datagram diff --git a/src/com/amazon/ion/impl/lite/IonBlobLite.java b/src/software/amazon/ion/impl/lite/IonBlobLite.java similarity index 90% rename from src/com/amazon/ion/impl/lite/IonBlobLite.java rename to src/software/amazon/ion/impl/lite/IonBlobLite.java index 4373d6dcf2..a885b49ebd 100644 --- a/src/com/amazon/ion/impl/lite/IonBlobLite.java +++ b/src/software/amazon/ion/impl/lite/IonBlobLite.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.IonBlob; +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.ValueVisitor; +import software.amazon.ion.impl._Private_Utils; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/lite/IonBoolLite.java b/src/software/amazon/ion/impl/lite/IonBoolLite.java similarity index 92% rename from src/com/amazon/ion/impl/lite/IonBoolLite.java rename to src/software/amazon/ion/impl/lite/IonBoolLite.java index 7c62a943c1..5181e9034d 100644 --- a/src/com/amazon/ion/impl/lite/IonBoolLite.java +++ b/src/software/amazon/ion/impl/lite/IonBoolLite.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.IonBool; +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.NullValueException; +import software.amazon.ion.ValueVisitor; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/lite/IonClobLite.java b/src/software/amazon/ion/impl/lite/IonClobLite.java similarity index 90% rename from src/com/amazon/ion/impl/lite/IonClobLite.java rename to src/software/amazon/ion/impl/lite/IonClobLite.java index 38d7ec1d16..c28b03e1c7 100644 --- a/src/com/amazon/ion/impl/lite/IonClobLite.java +++ b/src/software/amazon/ion/impl/lite/IonClobLite.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.IonClob; +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.ValueVisitor; +import software.amazon.ion.impl._Private_Utils; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/software/amazon/ion/impl/lite/IonContainerLite.java similarity index 97% rename from src/com/amazon/ion/impl/lite/IonContainerLite.java rename to src/software/amazon/ion/impl/lite/IonContainerLite.java index 4efdd23dbb..7cff4b5059 100644 --- a/src/com/amazon/ion/impl/lite/IonContainerLite.java +++ b/src/software/amazon/ion/impl/lite/IonContainerLite.java @@ -13,20 +13,20 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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._Private_IonConstants; +import software.amazon.ion.impl._Private_IonContainer; +import software.amazon.ion.impl._Private_Utils; import java.util.HashMap; import java.util.Iterator; import java.util.ListIterator; diff --git a/src/com/amazon/ion/impl/lite/IonContext.java b/src/software/amazon/ion/impl/lite/IonContext.java similarity index 95% rename from src/com/amazon/ion/impl/lite/IonContext.java rename to src/software/amazon/ion/impl/lite/IonContext.java index 2f7089f1ef..579f619dfe 100644 --- a/src/com/amazon/ion/impl/lite/IonContext.java +++ b/src/software/amazon/ion/impl/lite/IonContext.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -import com.amazon.ion.IonContainer; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.IonContainer; +import software.amazon.ion.SymbolTable; /** * Provides the parent, system and symbol table definitions that are shared diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/software/amazon/ion/impl/lite/IonDatagramLite.java similarity index 98% rename from src/com/amazon/ion/impl/lite/IonDatagramLite.java rename to src/software/amazon/ion/impl/lite/IonDatagramLite.java index 75645fd862..35a4e79084 100644 --- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java +++ b/src/software/amazon/ion/impl/lite/IonDatagramLite.java @@ -13,27 +13,27 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +import static software.amazon.ion.SystemSymbols.ION_1_0; + +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._Private_CurriedValueFactory; +import software.amazon.ion.impl._Private_IonDatagram; +import software.amazon.ion.impl._Private_Utils; import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Array; diff --git a/src/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/software/amazon/ion/impl/lite/IonDecimalLite.java similarity index 94% rename from src/com/amazon/ion/impl/lite/IonDecimalLite.java rename to src/software/amazon/ion/impl/lite/IonDecimalLite.java index 4a8d71e7a1..723f4a0f63 100644 --- a/src/com/amazon/ion/impl/lite/IonDecimalLite.java +++ b/src/software/amazon/ion/impl/lite/IonDecimalLite.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/software/amazon/ion/impl/lite/IonFloatLite.java similarity index 93% rename from src/com/amazon/ion/impl/lite/IonFloatLite.java rename to src/software/amazon/ion/impl/lite/IonFloatLite.java index 66118c291d..838bb9d37b 100644 --- a/src/com/amazon/ion/impl/lite/IonFloatLite.java +++ b/src/software/amazon/ion/impl/lite/IonFloatLite.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/com/amazon/ion/impl/lite/IonIntLite.java b/src/software/amazon/ion/impl/lite/IonIntLite.java similarity index 95% rename from src/com/amazon/ion/impl/lite/IonIntLite.java rename to src/software/amazon/ion/impl/lite/IonIntLite.java index 3fce4810aa..a052861e3a 100644 --- a/src/com/amazon/ion/impl/lite/IonIntLite.java +++ b/src/software/amazon/ion/impl/lite/IonIntLite.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/com/amazon/ion/impl/lite/IonListLite.java b/src/software/amazon/ion/impl/lite/IonListLite.java similarity index 90% rename from src/com/amazon/ion/impl/lite/IonListLite.java rename to src/software/amazon/ion/impl/lite/IonListLite.java index 3d8ad0d0b0..9510d538b2 100644 --- a/src/com/amazon/ion/impl/lite/IonListLite.java +++ b/src/software/amazon/ion/impl/lite/IonListLite.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.ContainedValueException; +import software.amazon.ion.IonList; +import software.amazon.ion.IonType; +import software.amazon.ion.IonValue; +import software.amazon.ion.ValueVisitor; import java.util.Collection; diff --git a/src/com/amazon/ion/impl/lite/IonLoaderLite.java b/src/software/amazon/ion/impl/lite/IonLoaderLite.java similarity index 88% rename from src/com/amazon/ion/impl/lite/IonLoaderLite.java rename to src/software/amazon/ion/impl/lite/IonLoaderLite.java index 62e963de4c..3a58aa5176 100644 --- a/src/com/amazon/ion/impl/lite/IonLoaderLite.java +++ b/src/software/amazon/ion/impl/lite/IonLoaderLite.java @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -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; -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; +package software.amazon.ion.impl.lite; + +import static software.amazon.ion.impl._Private_IonReaderFactory.makeReader; + +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._Private_IonWriterFactory; +import software.amazon.ion.impl._Private_LocalSymbolTableFactory; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/lite/IonLobLite.java b/src/software/amazon/ion/impl/lite/IonLobLite.java similarity index 97% rename from src/com/amazon/ion/impl/lite/IonLobLite.java rename to src/software/amazon/ion/impl/lite/IonLobLite.java index b74033c168..ecfc04581e 100644 --- a/src/com/amazon/ion/impl/lite/IonLobLite.java +++ b/src/software/amazon/ion/impl/lite/IonLobLite.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -import com.amazon.ion.IonLob; +import software.amazon.ion.IonLob; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.zip.CRC32; diff --git a/src/com/amazon/ion/impl/lite/IonNullLite.java b/src/software/amazon/ion/impl/lite/IonNullLite.java similarity index 90% rename from src/com/amazon/ion/impl/lite/IonNullLite.java rename to src/software/amazon/ion/impl/lite/IonNullLite.java index ce6abefabe..7ab76f0245 100644 --- a/src/com/amazon/ion/impl/lite/IonNullLite.java +++ b/src/software/amazon/ion/impl/lite/IonNullLite.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.IonNull; +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.ValueVisitor; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/software/amazon/ion/impl/lite/IonSequenceLite.java similarity index 98% rename from src/com/amazon/ion/impl/lite/IonSequenceLite.java rename to src/software/amazon/ion/impl/lite/IonSequenceLite.java index 5214b79ec3..ff2f875258 100644 --- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java +++ b/src/software/amazon/ion/impl/lite/IonSequenceLite.java @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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._Private_CurriedValueFactory; +import software.amazon.ion.impl._Private_IonValue; import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/src/com/amazon/ion/impl/lite/IonSexpLite.java b/src/software/amazon/ion/impl/lite/IonSexpLite.java similarity index 90% rename from src/com/amazon/ion/impl/lite/IonSexpLite.java rename to src/software/amazon/ion/impl/lite/IonSexpLite.java index 42a5625865..a2d74d3c4e 100644 --- a/src/com/amazon/ion/impl/lite/IonSexpLite.java +++ b/src/software/amazon/ion/impl/lite/IonSexpLite.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.ContainedValueException; +import software.amazon.ion.IonSexp; +import software.amazon.ion.IonType; +import software.amazon.ion.IonValue; +import software.amazon.ion.ValueVisitor; import java.util.Collection; diff --git a/src/com/amazon/ion/impl/lite/IonStringLite.java b/src/software/amazon/ion/impl/lite/IonStringLite.java similarity index 91% rename from src/com/amazon/ion/impl/lite/IonStringLite.java rename to src/software/amazon/ion/impl/lite/IonStringLite.java index e7bd0e945b..7201ecdfe8 100644 --- a/src/com/amazon/ion/impl/lite/IonStringLite.java +++ b/src/software/amazon/ion/impl/lite/IonStringLite.java @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.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 software.amazon.ion.IonString; +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.ValueVisitor; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/software/amazon/ion/impl/lite/IonStructLite.java similarity index 97% rename from src/com/amazon/ion/impl/lite/IonStructLite.java rename to src/software/amazon/ion/impl/lite/IonStructLite.java index 2f0afd334c..f1495fd486 100644 --- a/src/com/amazon/ion/impl/lite/IonStructLite.java +++ b/src/software/amazon/ion/impl/lite/IonStructLite.java @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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._Private_CurriedValueFactory; +import software.amazon.ion.util.Equivalence; +import software.amazon.ion.UnknownSymbolException; import java.io.IOException; import java.io.PrintWriter; import java.util.Arrays; diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/software/amazon/ion/impl/lite/IonSymbolLite.java similarity index 93% rename from src/com/amazon/ion/impl/lite/IonSymbolLite.java rename to src/software/amazon/ion/impl/lite/IonSymbolLite.java index 88ba206756..f2724814ff 100644 --- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java +++ b/src/software/amazon/ion/impl/lite/IonSymbolLite.java @@ -13,21 +13,21 @@ * permissions and limitations under the License. */ -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; +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_1_0_SID; + +import software.amazon.ion.IonType; +import software.amazon.ion.IonWriter; +import software.amazon.ion.NullValueException; +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._Private_IonSymbol; +import software.amazon.ion.impl._Private_Utils; import java.io.IOException; diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java similarity index 92% rename from src/com/amazon/ion/impl/lite/IonSystemLite.java rename to src/software/amazon/ion/impl/lite/IonSystemLite.java index 95bfa4d08a..212755b5db 100644 --- a/src/com/amazon/ion/impl/lite/IonSystemLite.java +++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java @@ -13,42 +13,42 @@ * permissions and limitations under the License. */ -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; +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._Private_IonReaderFactory.makeReader; +import static software.amazon.ion.impl._Private_IonReaderFactory.makeSystemReader; +import static software.amazon.ion.impl._Private_Utils.addAllNonNull; +import static software.amazon.ion.impl._Private_Utils.initialSymtab; +import static software.amazon.ion.impl._Private_Utils.newSymbolToken; +import static software.amazon.ion.util.IonTextUtils.printString; + +import software.amazon.ion.IonBinaryWriter; +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.IonTextReader; +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._Private_IonBinaryWriterBuilder; +import software.amazon.ion.impl._Private_IonSystem; +import software.amazon.ion.impl._Private_IonWriterFactory; +import software.amazon.ion.impl._Private_ScalarConversions.CantConvertException; +import software.amazon.ion.impl._Private_Utils; +import software.amazon.ion.system.IonReaderBuilder; +import software.amazon.ion.system.IonTextWriterBuilder; import java.io.Closeable; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/amazon/ion/impl/lite/IonTextLite.java b/src/software/amazon/ion/impl/lite/IonTextLite.java similarity index 95% rename from src/com/amazon/ion/impl/lite/IonTextLite.java rename to src/software/amazon/ion/impl/lite/IonTextLite.java index 8001300c9f..2cad1bfcd8 100644 --- a/src/com/amazon/ion/impl/lite/IonTextLite.java +++ b/src/software/amazon/ion/impl/lite/IonTextLite.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -import com.amazon.ion.IonText; +import software.amazon.ion.IonText; abstract class IonTextLite diff --git a/src/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/software/amazon/ion/impl/lite/IonTimestampLite.java similarity index 95% rename from src/com/amazon/ion/impl/lite/IonTimestampLite.java rename to src/software/amazon/ion/impl/lite/IonTimestampLite.java index 7696d10f4b..d8b3805d7b 100644 --- a/src/com/amazon/ion/impl/lite/IonTimestampLite.java +++ b/src/software/amazon/ion/impl/lite/IonTimestampLite.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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; import java.io.IOException; import java.math.BigDecimal; import java.util.Date; diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/software/amazon/ion/impl/lite/IonValueLite.java similarity index 97% rename from src/com/amazon/ion/impl/lite/IonValueLite.java rename to src/software/amazon/ion/impl/lite/IonValueLite.java index 8c58a0dd7b..36a9479d4a 100644 --- a/src/com/amazon/ion/impl/lite/IonValueLite.java +++ b/src/software/amazon/ion/impl/lite/IonValueLite.java @@ -13,29 +13,29 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID; +import static software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY; +import static software.amazon.ion.impl._Private_Utils.newSymbolToken; +import static software.amazon.ion.util.Equivalence.ionEquals; + +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._Private_IonValue; +import software.amazon.ion.impl._Private_IonWriter; +import software.amazon.ion.impl._Private_Utils; +import software.amazon.ion.system.IonTextWriterBuilder; +import software.amazon.ion.util.Printer; import java.io.IOException; import java.io.PrintWriter; @@ -825,7 +825,7 @@ protected int hashTypeAnnotations(final int original, SymbolTableProvider symbol * Implements equality over values. * This is currently defined using the Equivalence class. * - * @see com.amazon.ion.util.Equivalence + * @see software.amazon.ion.util.Equivalence * * @param other The value to compare with. * diff --git a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java b/src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java similarity index 94% rename from src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java rename to src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java index 250ca1e0f9..e445fce5f8 100644 --- a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java +++ b/src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java @@ -13,57 +13,57 @@ * permissions and limitations under the License. */ -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; +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._Private_IonConstants.BINARY_VERSION_MARKER_1_0; +import static software.amazon.ion.impl._Private_IonConstants.lnBooleanFalse; +import static software.amazon.ion.impl._Private_IonConstants.lnBooleanTrue; +import static software.amazon.ion.impl._Private_IonConstants.lnIsNull; +import static software.amazon.ion.impl._Private_IonConstants.lnIsVarLen; +import static software.amazon.ion.impl._Private_IonConstants.tidBlob; +import static software.amazon.ion.impl._Private_IonConstants.tidBoolean; +import static software.amazon.ion.impl._Private_IonConstants.tidClob; +import static software.amazon.ion.impl._Private_IonConstants.tidDecimal; +import static software.amazon.ion.impl._Private_IonConstants.tidFloat; +import static software.amazon.ion.impl._Private_IonConstants.tidList; +import static software.amazon.ion.impl._Private_IonConstants.tidNegInt; +import static software.amazon.ion.impl._Private_IonConstants.tidNull; +import static software.amazon.ion.impl._Private_IonConstants.tidPosInt; +import static software.amazon.ion.impl._Private_IonConstants.tidSexp; +import static software.amazon.ion.impl._Private_IonConstants.tidString; +import static software.amazon.ion.impl._Private_IonConstants.tidStruct; +import static software.amazon.ion.impl._Private_IonConstants.tidSymbol; +import static software.amazon.ion.impl._Private_IonConstants.tidTimestamp; +import static software.amazon.ion.impl._Private_IonConstants.tidTypedecl; + +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; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; @@ -801,7 +801,7 @@ private void writeIonFloatContent(IonFloat val) private static final byte[] positiveZeroBitArray = new byte[0]; /** - * @see com.amazon.ion.impl.IonBinary.Writer#writeDecimalContent + * @see software.amazon.ion.impl.IonBinary.Writer#writeDecimalContent */ private void writeIonDecimalContent(BigDecimal bd) { diff --git a/src/com/amazon/ion/impl/lite/TopLevelContext.java b/src/software/amazon/ion/impl/lite/TopLevelContext.java similarity index 96% rename from src/com/amazon/ion/impl/lite/TopLevelContext.java rename to src/software/amazon/ion/impl/lite/TopLevelContext.java index 797ff6c9cc..2a2dc8fb12 100644 --- a/src/com/amazon/ion/impl/lite/TopLevelContext.java +++ b/src/software/amazon/ion/impl/lite/TopLevelContext.java @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.SymbolTable; /** diff --git a/src/com/amazon/ion/impl/lite/ValueFactoryLite.java b/src/software/amazon/ion/impl/lite/ValueFactoryLite.java similarity index 95% rename from src/com/amazon/ion/impl/lite/ValueFactoryLite.java rename to src/software/amazon/ion/impl/lite/ValueFactoryLite.java index 9d9800f9b9..d9b98ed671 100644 --- a/src/com/amazon/ion/impl/lite/ValueFactoryLite.java +++ b/src/software/amazon/ion/impl/lite/ValueFactoryLite.java @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.impl.lite; + +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._Private_LocalSymbolTableFactory; +import software.amazon.ion.impl._Private_Utils; +import software.amazon.ion.impl._Private_ValueFactory; import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; diff --git a/src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java b/src/software/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java similarity index 83% rename from src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java rename to src/software/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java index d9749aa3ac..f8cebda1cb 100644 --- a/src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java +++ b/src/software/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.ion.impl.lite; +package software.amazon.ion.impl.lite; -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; +import software.amazon.ion.IonSystem; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.impl._Private_IonBinaryWriterBuilder; +import software.amazon.ion.system.IonReaderBuilder; +import software.amazon.ion.system.IonTextWriterBuilder; /** * NOT FOR APPLICATION USE! diff --git a/src/com/amazon/ion/overview.html b/src/software/amazon/ion/overview.html similarity index 78% rename from src/com/amazon/ion/overview.html rename to src/software/amazon/ion/overview.html index cf81a4bda3..36b1beb396 100644 --- a/src/com/amazon/ion/overview.html +++ b/src/software/amazon/ion/overview.html @@ -37,29 +37,29 @@

Start at IonSystem

-The central interface in ion-java is {@link com.amazon.ion.IonSystem}, which is +The central interface in ion-java is {@link software.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 com.amazon.ion.IonValue IonValue} hierarchies. +{@link software.amazon.ion.IonValue IonValue} hierarchies.

What all this means is that your first task is acquiring a system instance, and for that we turn to -{@link com.amazon.ion.system.IonSystemBuilder IonSystemBuilder}. +{@link software.amazon.ion.system.IonSystemBuilder IonSystemBuilder}. Here's the easiest way to bootstrap: 

     IonSystem ion = IonSystemBuilder.standard().build();
That should be sufficient for many, but not all, applications. Long-running services will probably want to use a non-default -{@linkplain com.amazon.ion.IonCatalog catalog} by configuring the builder -before calling {@link com.amazon.ion.system.IonSystemBuilder#build() build()}. +{@linkplain software.amazon.ion.IonCatalog catalog} by configuring the builder +before calling {@link software.amazon.ion.system.IonSystemBuilder#build() build()}.

SystemFactory is Deprecated

-As of early 2011, the {@link com.amazon.ion.system.SystemFactory SystemFactory} +As of early 2011, the {@link software.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. @@ -79,7 +79,7 @@

An Important Caveat

Given any {@code IonValue} instance it is possible to retrieve the relevant -system via {@link com.amazon.ion.IonValue#getSystem()}. +system via {@link software.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 @@ -94,14 +94,14 @@

Getting Data In

This release defines three mechanisms for accepting Ion data:
    -
  • {@link com.amazon.ion.IonReader IonReader} scans an input stream using a +
  • {@link software.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.
  • 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. -
  • {@link com.amazon.ion.IonLoader IonLoader} loads an entire input stream - into a single {@linkplain com.amazon.ion.IonDatagram datagram}. +
  • {@link software.amazon.ion.IonLoader IonLoader} loads an entire input stream + into a single {@linkplain software.amazon.ion.IonDatagram datagram}. This "all at once" input mechanism is intended for document-oriented applications.
@@ -111,42 +111,42 @@

Getting Data In

To construct an {@code IonReader}, call one of the {@code newReader} methods on {@code IonSystem}; for example -{@link com.amazon.ion.IonSystem#newReader(InputStream)}. +{@link software.amazon.ion.IonSystem#newReader(InputStream)}. You can then pull data from the reader. Don't forget to -{@link com.amazon.ion.IonReader#close() close} it when you're done! +{@link software.amazon.ion.IonReader#close() close} it when you're done!

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 com.amazon.ion.IonSystem#iterate(InputStream)}. +{@link software.amazon.ion.IonSystem#iterate(InputStream)}.

To construct an {@code IonLoader}, call -{@link com.amazon.ion.IonSystem#newLoader()} and configure it as necessary. +{@link software.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 com.amazon.ion.IonSystem#getLoader()}. +{@link software.amazon.ion.IonSystem#getLoader()}.

Getting Data Out

There's also several mechanisms for generating Ion data:
    -
  • {@link com.amazon.ion.IonWriter IonWriter} is the low-level API for +
  • {@link software.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. -
  • {@link com.amazon.ion.IonValue#toString() IonValue.toString()} will also +
  • {@link software.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! -
  • {@link com.amazon.ion.IonValue#writeTo(IonWriter)} outputs Ion data in +
  • {@link software.amazon.ion.IonValue#writeTo(IonWriter)} outputs Ion data in the writer's format. This is the best way to output the data model. -
  • From an {@link com.amazon.ion.IonDatagram IonDatagram} you can call - {@link com.amazon.ion.IonDatagram#getBytes() getBytes()} to get Ion +
  • From an {@link software.amazon.ion.IonDatagram IonDatagram} you can call + {@link software.amazon.ion.IonDatagram#getBytes() getBytes()} to get Ion binary data.
You can create {@code IonWriter}s using methods on {@code IonSystem}, but the -{@link com.amazon.ion.system.IonTextWriterBuilder} provides more flexibility. +{@link software.amazon.ion.system.IonTextWriterBuilder} provides more flexibility.

No Canonical Serialization

@@ -165,11 +165,11 @@

No Canonical Serialization

assertEquals(expectedIonValue.toString(), actualIonValue.toString()); The same goes for output via any other API, including -{@link com.amazon.ion.IonWriter IonWriter}s. +{@link software.amazon.ion.IonWriter IonWriter}s.

The correct approach to performing semantic equivalence checks over Ion data is to use documented equivalence APIs such as -{@link com.amazon.ion.IonValue#equals(Object) IonValue.equals()}. +{@link software.amazon.ion.IonValue#equals(Object) IonValue.equals()}.

JSON Integration

The Ion text format is a superset of JSON, so JSON data is Ion data. @@ -181,9 +181,9 @@

JSON Integration

To output JSON with this library, Ion data can be "downconverted" to JSON format using an -{@link com.amazon.ion.system.IonTextWriterBuilder IonTextWriterBuilder}. +{@link software.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 +(The {@link software.amazon.ion.util.Printer Printer} can also be used, but it is no longer recommended and will be deprecated.)

Thread Safety

diff --git a/src/com/amazon/ion/package-info.java b/src/software/amazon/ion/package-info.java similarity index 95% rename from src/com/amazon/ion/package-info.java rename to src/software/amazon/ion/package-info.java index 9923ef22b4..f3408d7b2d 100644 --- a/src/com/amazon/ion/package-info.java +++ b/src/software/amazon/ion/package-info.java @@ -16,4 +16,4 @@ /** * Public interfaces of the core Ion system. */ -package com.amazon.ion; +package software.amazon.ion; diff --git a/src/com/amazon/ion/system/IonBinaryWriterBuilder.java b/src/software/amazon/ion/system/IonBinaryWriterBuilder.java similarity index 96% rename from src/com/amazon/ion/system/IonBinaryWriterBuilder.java rename to src/software/amazon/ion/system/IonBinaryWriterBuilder.java index c6d6a0e545..95740f4930 100644 --- a/src/com/amazon/ion/system/IonBinaryWriterBuilder.java +++ b/src/software/amazon/ion/system/IonBinaryWriterBuilder.java @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; - -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; +package software.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._Private_IonBinaryWriterBuilder; /** diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/software/amazon/ion/system/IonReaderBuilder.java similarity index 95% rename from src/com/amazon/ion/system/IonReaderBuilder.java rename to src/software/amazon/ion/system/IonReaderBuilder.java index 895933b43d..1e39c428c6 100644 --- a/src/com/amazon/ion/system/IonReaderBuilder.java +++ b/src/software/amazon/ion/system/IonReaderBuilder.java @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; -import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader; +import static software.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 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.IonTextReader; +import software.amazon.ion.IonValue; import java.io.IOException; import java.io.InputStream; import java.io.Reader; diff --git a/src/com/amazon/ion/system/IonSystemBuilder.java b/src/software/amazon/ion/system/IonSystemBuilder.java similarity index 95% rename from src/com/amazon/ion/system/IonSystemBuilder.java rename to src/software/amazon/ion/system/IonSystemBuilder.java index 22141e83b7..37c14ef8fb 100644 --- a/src/com/amazon/ion/system/IonSystemBuilder.java +++ b/src/software/amazon/ion/system/IonSystemBuilder.java @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; -import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.newLiteSystem; +import static software.amazon.ion.impl.lite._Private_LiteDomTrampoline.newLiteSystem; -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; +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._Private_IonBinaryWriterBuilder; +import software.amazon.ion.impl._Private_Utils; /** * The builder for creating {@link IonSystem}s. diff --git a/src/com/amazon/ion/system/IonTextWriterBuilder.java b/src/software/amazon/ion/system/IonTextWriterBuilder.java similarity index 97% rename from src/com/amazon/ion/system/IonTextWriterBuilder.java rename to src/software/amazon/ion/system/IonTextWriterBuilder.java index daa90ff689..8f23d71ccf 100644 --- a/src/com/amazon/ion/system/IonTextWriterBuilder.java +++ b/src/software/amazon/ion/system/IonTextWriterBuilder.java @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; -import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS; +import static software.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 software.amazon.ion.IonCatalog; +import software.amazon.ion.IonWriter; +import software.amazon.ion.SymbolTable; +import software.amazon.ion.impl._Private_IonTextWriterBuilder; +import software.amazon.ion.impl._Private_Utils; import java.io.OutputStream; import java.nio.charset.Charset; @@ -95,7 +95,7 @@ public enum LstMinimizing /** * Discards everything, collapsing the LST to an IVM. - * If {@link com.amazon.ion.system.IonWriterBuilder.IvmMinimizing} + * If {@link software.amazon.ion.system.IonWriterBuilder.IvmMinimizing} * is also in effect, then even that IVM may be suppressed. * * @see IonTextWriterBuilder#setIvmMinimizing(IonWriterBuilder.IvmMinimizing) diff --git a/src/com/amazon/ion/system/IonWriterBuilder.java b/src/software/amazon/ion/system/IonWriterBuilder.java similarity index 97% rename from src/com/amazon/ion/system/IonWriterBuilder.java rename to src/software/amazon/ion/system/IonWriterBuilder.java index f61f170822..3b22b9521b 100644 --- a/src/com/amazon/ion/system/IonWriterBuilder.java +++ b/src/software/amazon/ion/system/IonWriterBuilder.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; import java.io.OutputStream; -import com.amazon.ion.IonWriter; +import software.amazon.ion.IonWriter; /** * Common options for writing Ion data streams of any form. diff --git a/src/com/amazon/ion/system/IonWriterBuilderBase.java b/src/software/amazon/ion/system/IonWriterBuilderBase.java similarity index 97% rename from src/com/amazon/ion/system/IonWriterBuilderBase.java rename to src/software/amazon/ion/system/IonWriterBuilderBase.java index a36601e845..7de813ec01 100644 --- a/src/com/amazon/ion/system/IonWriterBuilderBase.java +++ b/src/software/amazon/ion/system/IonWriterBuilderBase.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.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; diff --git a/src/com/amazon/ion/system/SimpleCatalog.java b/src/software/amazon/ion/system/SimpleCatalog.java similarity index 97% rename from src/com/amazon/ion/system/SimpleCatalog.java rename to src/software/amazon/ion/system/SimpleCatalog.java index 7ce65756f0..657b0b39e4 100644 --- a/src/com/amazon/ion/system/SimpleCatalog.java +++ b/src/software/amazon/ion/system/SimpleCatalog.java @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; -import com.amazon.ion.IonCatalog; -import com.amazon.ion.IonMutableCatalog; -import com.amazon.ion.SymbolTable; +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonMutableCatalog; +import software.amazon.ion.SymbolTable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/com/amazon/ion/system/SystemFactory.java b/src/software/amazon/ion/system/SystemFactory.java similarity index 95% rename from src/com/amazon/ion/system/SystemFactory.java rename to src/software/amazon/ion/system/SystemFactory.java index fe4d209f5f..1e18211f86 100644 --- a/src/com/amazon/ion/system/SystemFactory.java +++ b/src/software/amazon/ion/system/SystemFactory.java @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.ion.system; +package software.amazon.ion.system; -import com.amazon.ion.IonCatalog; -import com.amazon.ion.IonSystem; +import software.amazon.ion.IonCatalog; +import software.amazon.ion.IonSystem; /** * The factory for creating {@link IonSystem}s. diff --git a/src/com/amazon/ion/system/package-info.java b/src/software/amazon/ion/system/package-info.java similarity index 94% rename from src/com/amazon/ion/system/package-info.java rename to src/software/amazon/ion/system/package-info.java index c7fc56c746..a749d6cee4 100644 --- a/src/com/amazon/ion/system/package-info.java +++ b/src/software/amazon/ion/system/package-info.java @@ -16,4 +16,4 @@ /** * Public implementation of the core Ion system. */ -package com.amazon.ion.system; +package software.amazon.ion.system; diff --git a/src/com/amazon/ion/util/AbstractValueVisitor.java b/src/software/amazon/ion/util/AbstractValueVisitor.java similarity index 82% rename from src/com/amazon/ion/util/AbstractValueVisitor.java rename to src/software/amazon/ion/util/AbstractValueVisitor.java index 246e8ad8b7..301e4ad301 100644 --- a/src/com/amazon/ion/util/AbstractValueVisitor.java +++ b/src/software/amazon/ion/util/AbstractValueVisitor.java @@ -13,24 +13,24 @@ * permissions and limitations under the License. */ -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; +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; /** * A base class for extending Ion {@link ValueVisitor}s. diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/software/amazon/ion/util/Equivalence.java similarity index 96% rename from src/com/amazon/ion/util/Equivalence.java rename to src/software/amazon/ion/util/Equivalence.java index 70759b884f..13b2a39102 100644 --- a/src/com/amazon/ion/util/Equivalence.java +++ b/src/software/amazon/ion/util/Equivalence.java @@ -13,25 +13,25 @@ * permissions and limitations under the License. */ -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; +package software.amazon.ion.util; + +import static software.amazon.ion.impl._Private_IonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX; + +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; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; @@ -49,13 +49,13 @@ *
  *    IonValue v1 = ...;
  *    IonValue v2 = ...;
- *    com.amazon.ion.util.Equivalence.ionEquals( v1, v2 );
+ *    software.amazon.ion.util.Equivalence.ionEquals( v1, v2 );
  *
* * More likely, a static import would make using this class easier. * *
- *    import static com.amazon.ion.util.Equivalence.ionEquals;
+ *    import static software.amazon.ion.util.Equivalence.ionEquals;
  *    ...
  *    boolean equivalent = ionEquals( v1, v2 );
  *
@@ -65,8 +65,8 @@ * instance using {@link Equivalence.Builder}. For example: * * 
- *     com.amazon.ion.util.Equivalence equivalence =
- *         new com.amazon.ion.util.Equivalence.Builder()
+ *     software.amazon.ion.util.Equivalence equivalence =
+ *         new software.amazon.ion.util.Equivalence.Builder()
  *             .withEpsilon(1e-6)
  *             .build();
  *     IonValue v1 = ...;
diff --git a/src/com/amazon/ion/util/GzipOrRawInputStream.java b/src/software/amazon/ion/util/GzipOrRawInputStream.java
similarity index 98%
rename from src/com/amazon/ion/util/GzipOrRawInputStream.java
rename to src/software/amazon/ion/util/GzipOrRawInputStream.java
index 68b60f1e83..f2191e74d5 100644
--- a/src/com/amazon/ion/util/GzipOrRawInputStream.java
+++ b/src/software/amazon/ion/util/GzipOrRawInputStream.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/src/com/amazon/ion/util/IonStreamUtils.java b/src/software/amazon/ion/util/IonStreamUtils.java
similarity index 96%
rename from src/com/amazon/ion/util/IonStreamUtils.java
rename to src/software/amazon/ion/util/IonStreamUtils.java
index 798fcfc62a..784fb7edf5 100644
--- a/src/com/amazon/ion/util/IonStreamUtils.java
+++ b/src/software/amazon/ion/util/IonStreamUtils.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
-import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
-import static com.amazon.ion.util.GzipOrRawInputStream.GZIP_HEADER;
+import static software.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static software.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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.impl._Private_ListWriter;
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/src/com/amazon/ion/util/IonTextUtils.java b/src/software/amazon/ion/util/IonTextUtils.java
similarity index 97%
rename from src/com/amazon/ion/util/IonTextUtils.java
rename to src/software/amazon/ion/util/IonTextUtils.java
index 47e0d17326..42475cd636 100644
--- a/src/com/amazon/ion/util/IonTextUtils.java
+++ b/src/software/amazon/ion/util/IonTextUtils.java
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
-
-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;
+package software.amazon.ion.util;
+
+import static software.amazon.ion.impl._Private_IonConstants.isHighSurrogate;
+import static software.amazon.ion.impl._Private_IonConstants.isLowSurrogate;
+import static software.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar;
+import static software.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING;
+import static software.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword;
+import static software.amazon.ion.impl._Private_IonTextAppender.symbolNeedsQuoting;
+import static software.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD;
+
+import software.amazon.ion.SymbolToken;
+import software.amazon.ion.impl._Private_IonTextAppender;
 import java.io.IOException;
 import java.math.BigDecimal;
 
diff --git a/src/com/amazon/ion/util/IonValueUtils.java b/src/software/amazon/ion/util/IonValueUtils.java
similarity index 93%
rename from src/com/amazon/ion/util/IonValueUtils.java
rename to src/software/amazon/ion/util/IonValueUtils.java
index bd1591cca9..e30578c479 100644
--- a/src/com/amazon/ion/util/IonValueUtils.java
+++ b/src/software/amazon/ion/util/IonValueUtils.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
-import com.amazon.ion.IonValue;
+import software.amazon.ion.IonValue;
 
 /**
  * Utility methods for working with {@link IonValue}s.
diff --git a/src/com/amazon/ion/util/JarInfo.java b/src/software/amazon/ion/util/JarInfo.java
similarity index 97%
rename from src/com/amazon/ion/util/JarInfo.java
rename to src/software/amazon/ion/util/JarInfo.java
index 1f0ba4807f..a109c24e4f 100644
--- a/src/com/amazon/ion/util/JarInfo.java
+++ b/src/software/amazon/ion/util/JarInfo.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
 import java.io.IOException;
 import java.net.URL;
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-import com.amazon.ion.IonException;
-import com.amazon.ion.Timestamp;
+import software.amazon.ion.IonException;
+import software.amazon.ion.Timestamp;
 
 
 /**
diff --git a/src/com/amazon/ion/util/Printer.java b/src/software/amazon/ion/util/Printer.java
similarity index 95%
rename from src/com/amazon/ion/util/Printer.java
rename to src/software/amazon/ion/util/Printer.java
index cc717b1d7e..daf9029ae1 100644
--- a/src/com/amazon/ion/util/Printer.java
+++ b/src/software/amazon/ion/util/Printer.java
@@ -13,45 +13,45 @@
  * 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;
+package software.amazon.ion.util;
+
+import static software.amazon.ion.SystemSymbols.IMPORTS;
+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 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.IonFloat;
+import software.amazon.ion.IonInt;
+import software.amazon.ion.IonList;
+import software.amazon.ion.IonNull;
+import software.amazon.ion.IonReader;
+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.IonWriter;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.SymbolToken;
+import software.amazon.ion.Timestamp;
+import software.amazon.ion.impl._Private_IonSymbol;
+import software.amazon.ion.impl._Private_IonSystem;
+import software.amazon.ion.impl._Private_IonTextWriterBuilder;
+import software.amazon.ion.impl._Private_IonValue;
+import software.amazon.ion.impl._Private_IonValue.SymbolTableProvider;
+import software.amazon.ion.system.IonTextWriterBuilder;
+import software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
+import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+import software.amazon.ion.util.IonTextUtils.SymbolVariant;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
diff --git a/src/com/amazon/ion/util/Spans.java b/src/software/amazon/ion/util/Spans.java
similarity index 91%
rename from src/com/amazon/ion/util/Spans.java
rename to src/software/amazon/ion/util/Spans.java
index 4d65750c1a..4642cc69d2 100644
--- a/src/com/amazon/ion/util/Spans.java
+++ b/src/software/amazon/ion/util/Spans.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
-import static com.amazon.ion.facet.Facets.asFacet;
+import static software.amazon.ion.facet.Facets.asFacet;
 
-import com.amazon.ion.Span;
-import com.amazon.ion.SpanProvider;
+import software.amazon.ion.Span;
+import software.amazon.ion.SpanProvider;
 
 /**
  * Utility methods for working with {@link Span}s.
diff --git a/src/com/amazon/ion/util/_Private_FastAppendable.java b/src/software/amazon/ion/util/_Private_FastAppendable.java
similarity index 98%
rename from src/com/amazon/ion/util/_Private_FastAppendable.java
rename to src/software/amazon/ion/util/_Private_FastAppendable.java
index 136bdaf43b..eaf11f3c5f 100644
--- a/src/com/amazon/ion/util/_Private_FastAppendable.java
+++ b/src/software/amazon/ion/util/_Private_FastAppendable.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
 import java.io.IOException;
 
diff --git a/src/com/amazon/ion/util/package-info.java b/src/software/amazon/ion/util/package-info.java
similarity index 95%
rename from src/com/amazon/ion/util/package-info.java
rename to src/software/amazon/ion/util/package-info.java
index 4cda041699..edd1be0f63 100644
--- a/src/com/amazon/ion/util/package-info.java
+++ b/src/software/amazon/ion/util/package-info.java
@@ -16,4 +16,4 @@
 /**
  * Various utilites for working with Ion data.
  */
-package com.amazon.ion.util;
+package software.amazon.ion.util;
diff --git a/test/AllTests.java b/test/AllTests.java
index 0e433b5b8b..3112356424 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -13,94 +13,94 @@
  * 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.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 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.IonRawWriterBasicTest;
+import software.amazon.ion.IonRawWriterSymbolsTest;
+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.RawValueSpanReaderBasicTest;
+import software.amazon.ion.impl.IonReaderBinaryRawLargeStreamTest;
+import software.amazon.ion.impl.RawValueSpanReaderTest;
+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.ByteBufferTest;
+import software.amazon.ion.impl.CharacterReaderTest;
+import software.amazon.ion.impl.IonImplUtilsTest;
+import software.amazon.ion.impl.IonMarkupWriterFilesTest;
+import software.amazon.ion.impl.IonMarkupWriterTest;
+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.PrinterTest;
+import software.amazon.ion.util.TextTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/test/com/amazon/ion/AnnotationEscapesTest.java b/test/software/amazon/ion/AnnotationEscapesTest.java
similarity index 96%
rename from test/com/amazon/ion/AnnotationEscapesTest.java
rename to test/software/amazon/ion/AnnotationEscapesTest.java
index 672c3a4a5c..f66df88dcc 100644
--- a/test/com/amazon/ion/AnnotationEscapesTest.java
+++ b/test/software/amazon/ion/AnnotationEscapesTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 public class AnnotationEscapesTest
diff --git a/test/com/amazon/ion/AssertionsEnabledTest.java b/test/software/amazon/ion/AssertionsEnabledTest.java
similarity index 97%
rename from test/com/amazon/ion/AssertionsEnabledTest.java
rename to test/software/amazon/ion/AssertionsEnabledTest.java
index 786cd8eec0..c691485b5b 100644
--- a/test/com/amazon/ion/AssertionsEnabledTest.java
+++ b/test/software/amazon/ion/AssertionsEnabledTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/test/com/amazon/ion/BadIonTest.java b/test/software/amazon/ion/BadIonTest.java
similarity index 89%
rename from test/com/amazon/ion/BadIonTest.java
rename to test/software/amazon/ion/BadIonTest.java
index 28b3602e2c..a5e08bb341 100644
--- a/test/com/amazon/ion/BadIonTest.java
+++ b/test/software/amazon/ion/BadIonTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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 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 com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
index 1bc2fac1a7..9e6b9fdc7e 100644
--- a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.Iterator;
 
diff --git a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java b/test/software/amazon/ion/BinaryReaderSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
rename to test/software/amazon/ion/BinaryReaderSystemProcessingTest.java
index c1894984bb..35669f06a6 100644
--- a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
+++ b/test/software/amazon/ion/BinaryReaderSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 
diff --git a/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java b/test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java
similarity index 96%
rename from test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
rename to test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java
index c1c5324abd..053c75c06c 100644
--- a/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
+++ b/test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.BitUtils.bytes;
+import static software.amazon.ion.BitUtils.bytes;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 
diff --git a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
index a0986d1201..5d016bd17e 100644
--- a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/BinaryTest.java b/test/software/amazon/ion/BinaryTest.java
similarity index 98%
rename from test/com/amazon/ion/BinaryTest.java
rename to test/software/amazon/ion/BinaryTest.java
index e7641ae01f..5e9dbd1397 100644
--- a/test/com/amazon/ion/BinaryTest.java
+++ b/test/software/amazon/ion/BinaryTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
 import java.util.Arrays;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/BitUtils.java b/test/software/amazon/ion/BitUtils.java
similarity index 98%
rename from test/com/amazon/ion/BitUtils.java
rename to test/software/amazon/ion/BitUtils.java
index c9a1ce72cf..06bb0e8c8a 100644
--- a/test/com/amazon/ion/BitUtils.java
+++ b/test/software/amazon/ion/BitUtils.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 public class BitUtils
 {
diff --git a/test/com/amazon/ion/BlobTest.java b/test/software/amazon/ion/BlobTest.java
similarity index 98%
rename from test/com/amazon/ion/BlobTest.java
rename to test/software/amazon/ion/BlobTest.java
index f39fcc210b..d0392db4c9 100644
--- a/test/com/amazon/ion/BlobTest.java
+++ b/test/software/amazon/ion/BlobTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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 static software.amazon.ion.TestUtils.US_ASCII_CHARSET;
+import static software.amazon.ion.impl._Private_Utils.encode;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/BoolTest.java b/test/software/amazon/ion/BoolTest.java
similarity index 99%
rename from test/com/amazon/ion/BoolTest.java
rename to test/software/amazon/ion/BoolTest.java
index 208c8724ae..54dc4cf3ee 100644
--- a/test/com/amazon/ion/BoolTest.java
+++ b/test/software/amazon/ion/BoolTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/Checker.java b/test/software/amazon/ion/Checker.java
similarity index 97%
rename from test/com/amazon/ion/Checker.java
rename to test/software/amazon/ion/Checker.java
index 7e41ffa178..91cc630260 100644
--- a/test/com/amazon/ion/Checker.java
+++ b/test/software/amazon/ion/Checker.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 public interface Checker
diff --git a/test/com/amazon/ion/ClobTest.java b/test/software/amazon/ion/ClobTest.java
similarity index 97%
rename from test/com/amazon/ion/ClobTest.java
rename to test/software/amazon/ion/ClobTest.java
index 07ef4ab300..febee14cdd 100644
--- a/test/com/amazon/ion/ClobTest.java
+++ b/test/software/amazon/ion/ClobTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
-import static com.amazon.ion.impl._Private_Utils.UTF8_CHARSET;
+import static software.amazon.ion.impl._Private_Utils.UTF8_CHARSET;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/test/com/amazon/ion/CloneTest.java b/test/software/amazon/ion/CloneTest.java
similarity index 97%
rename from test/com/amazon/ion/CloneTest.java
rename to test/software/amazon/ion/CloneTest.java
index b9cb52d253..ff11fd4f63 100644
--- a/test/com/amazon/ion/CloneTest.java
+++ b/test/software/amazon/ion/CloneTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static software.amazon.ion.impl._Private_Utils.newSymbolToken;
 
-import com.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.system.SimpleCatalog;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/test/com/amazon/ion/ContainerTestCase.java b/test/software/amazon/ion/ContainerTestCase.java
similarity index 99%
rename from test/com/amazon/ion/ContainerTestCase.java
rename to test/software/amazon/ion/ContainerTestCase.java
index 6ca1b7626a..602546ea46 100644
--- a/test/com/amazon/ion/ContainerTestCase.java
+++ b/test/software/amazon/ion/ContainerTestCase.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.system.SimpleCatalog;
 import java.util.Iterator;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java b/test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java
index 5831dd9c42..5bf082b19a 100644
--- a/test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.Iterator;
 
diff --git a/test/com/amazon/ion/DatagramMaker.java b/test/software/amazon/ion/DatagramMaker.java
similarity index 94%
rename from test/com/amazon/ion/DatagramMaker.java
rename to test/software/amazon/ion/DatagramMaker.java
index 7f2ef82f05..25a6f8cf4c 100644
--- a/test/com/amazon/ion/DatagramMaker.java
+++ b/test/software/amazon/ion/DatagramMaker.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.TestUtils.ensureBinary;
-import static com.amazon.ion.TestUtils.ensureText;
+import static software.amazon.ion.TestUtils.ensureBinary;
+import static software.amazon.ion.TestUtils.ensureText;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.util.ArrayList;
 import java.util.Arrays;
 
diff --git a/test/com/amazon/ion/DatagramTest.java b/test/software/amazon/ion/DatagramTest.java
similarity index 97%
rename from test/com/amazon/ion/DatagramTest.java
rename to test/software/amazon/ion/DatagramTest.java
index 9193cfabac..9d71eed2b9 100644
--- a/test/com/amazon/ion/DatagramTest.java
+++ b/test/software/amazon/ion/DatagramTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
-
-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;
+package software.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 software.amazon.ion.impl.Symtabs;
+import software.amazon.ion.impl._Private_IonSystem;
+import software.amazon.ion.impl._Private_IonValue;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Collection;
diff --git a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java b/test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
similarity index 94%
rename from test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
rename to test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
index f8077abb08..934becf67b 100644
--- a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
+++ b/test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.DatagramMaker.FROM_BYTES_TEXT;
+import static software.amazon.ion.DatagramMaker.FROM_BYTES_TEXT;
 
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.Injected.Inject;
 import org.junit.After;
 
 
diff --git a/test/com/amazon/ion/DecimalTest.java b/test/software/amazon/ion/DecimalTest.java
similarity index 99%
rename from test/com/amazon/ion/DecimalTest.java
rename to test/software/amazon/ion/DecimalTest.java
index 6d79dacfe7..369d6398aa 100644
--- a/test/com/amazon/ion/DecimalTest.java
+++ b/test/software/amazon/ion/DecimalTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.math.BigDecimal;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/EquivTimelineTest.java b/test/software/amazon/ion/EquivTimelineTest.java
similarity index 90%
rename from test/com/amazon/ion/EquivTimelineTest.java
rename to test/software/amazon/ion/EquivTimelineTest.java
index 58a5b78aa1..4d01ebfeca 100644
--- a/test/com/amazon/ion/EquivTimelineTest.java
+++ b/test/software/amazon/ion/EquivTimelineTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 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 com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/test/com/amazon/ion/EquivsTest.java b/test/software/amazon/ion/EquivsTest.java
similarity index 80%
rename from test/com/amazon/ion/EquivsTest.java
rename to test/software/amazon/ion/EquivsTest.java
index 4a295b7dc6..380a42a6ec 100644
--- a/test/com/amazon/ion/EquivsTest.java
+++ b/test/software/amazon/ion/EquivsTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.TestUtils.EQUIVS_IONTESTS_FILES;
-import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static software.amazon.ion.TestUtils.EQUIVS_IONTESTS_FILES;
+import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
 
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 
 public class EquivsTest
diff --git a/test/com/amazon/ion/EquivsTestCase.java b/test/software/amazon/ion/EquivsTestCase.java
similarity index 94%
rename from test/com/amazon/ion/EquivsTestCase.java
rename to test/software/amazon/ion/EquivsTestCase.java
index 7bdce6bb9e..ec1eb7d7cd 100644
--- a/test/com/amazon/ion/EquivsTestCase.java
+++ b/test/software/amazon/ion/EquivsTestCase.java
@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.IonType.DATAGRAM;
+import static software.amazon.ion.IonType.DATAGRAM;
 
-import com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.IonAssert;
+import software.amazon.ion.impl._Private_Utils;
+import software.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 software.amazon.ion.IonDatagram;
+import software.amazon.ion.IonSequence;
+import software.amazon.ion.IonString;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.impl._Private_Utils;
+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 java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/test/com/amazon/ion/ExtendedDecimalTest.java b/test/software/amazon/ion/ExtendedDecimalTest.java
similarity index 98%
rename from test/com/amazon/ion/ExtendedDecimalTest.java
rename to test/software/amazon/ion/ExtendedDecimalTest.java
index 7e95771899..57ac13f6fe 100644
--- a/test/com/amazon/ion/ExtendedDecimalTest.java
+++ b/test/software/amazon/ion/ExtendedDecimalTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.Decimal.negativeZero;
+import static software.amazon.ion.Decimal.negativeZero;
 import static java.math.MathContext.DECIMAL64;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/test/com/amazon/ion/FakeSymbolToken.java b/test/software/amazon/ion/FakeSymbolToken.java
similarity index 97%
rename from test/com/amazon/ion/FakeSymbolToken.java
rename to test/software/amazon/ion/FakeSymbolToken.java
index 426e95a40e..25a418b0d4 100644
--- a/test/com/amazon/ion/FakeSymbolToken.java
+++ b/test/software/amazon/ion/FakeSymbolToken.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 /**
  * NOT SUITABLE FOR PUBLIC USE since it doesn't enforce correctness.
diff --git a/test/com/amazon/ion/FieldNameEscapesTest.java b/test/software/amazon/ion/FieldNameEscapesTest.java
similarity index 96%
rename from test/com/amazon/ion/FieldNameEscapesTest.java
rename to test/software/amazon/ion/FieldNameEscapesTest.java
index 708f700bd6..638ba926f7 100644
--- a/test/com/amazon/ion/FieldNameEscapesTest.java
+++ b/test/software/amazon/ion/FieldNameEscapesTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 public class FieldNameEscapesTest
diff --git a/test/com/amazon/ion/FloatTest.java b/test/software/amazon/ion/FloatTest.java
similarity index 99%
rename from test/com/amazon/ion/FloatTest.java
rename to test/software/amazon/ion/FloatTest.java
index da7c273918..145cf129c8 100644
--- a/test/com/amazon/ion/FloatTest.java
+++ b/test/software/amazon/ion/FloatTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/GoodIonTest.java b/test/software/amazon/ion/GoodIonTest.java
similarity index 90%
rename from test/com/amazon/ion/GoodIonTest.java
rename to test/software/amazon/ion/GoodIonTest.java
index 9ee8505c95..86c08c3139 100644
--- a/test/com/amazon/ion/GoodIonTest.java
+++ b/test/software/amazon/ion/GoodIonTest.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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.testdataFiles;
-import static com.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
+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 com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.Injected.Inject;
-import com.amazon.ion.streaming.ReaderCompare;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.streaming.ReaderCompare;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Iterator;
diff --git a/test/com/amazon/ion/HashCodeCorrectnessTest.java b/test/software/amazon/ion/HashCodeCorrectnessTest.java
similarity index 99%
rename from test/com/amazon/ion/HashCodeCorrectnessTest.java
rename to test/software/amazon/ion/HashCodeCorrectnessTest.java
index d603cea2c7..1f513886c9 100644
--- a/test/com/amazon/ion/HashCodeCorrectnessTest.java
+++ b/test/software/amazon/ion/HashCodeCorrectnessTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/test/com/amazon/ion/HashCodeDeltaCollisionTest.java b/test/software/amazon/ion/HashCodeDeltaCollisionTest.java
similarity index 95%
rename from test/com/amazon/ion/HashCodeDeltaCollisionTest.java
rename to test/software/amazon/ion/HashCodeDeltaCollisionTest.java
index 51e9394292..f2dc104653 100644
--- a/test/com/amazon/ion/HashCodeDeltaCollisionTest.java
+++ b/test/software/amazon/ion/HashCodeDeltaCollisionTest.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.Timestamp.UTC_OFFSET;
+import static software.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 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;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Random;
diff --git a/test/com/amazon/ion/HashCodeDistributionTest.java b/test/software/amazon/ion/HashCodeDistributionTest.java
similarity index 97%
rename from test/com/amazon/ion/HashCodeDistributionTest.java
rename to test/software/amazon/ion/HashCodeDistributionTest.java
index ea36abc6cb..1c7b353f90 100644
--- a/test/com/amazon/ion/HashCodeDistributionTest.java
+++ b/test/software/amazon/ion/HashCodeDistributionTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 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 java.io.BufferedInputStream;
 import java.io.File;
diff --git a/test/com/amazon/ion/InputStreamWrapper.java b/test/software/amazon/ion/InputStreamWrapper.java
similarity index 96%
rename from test/com/amazon/ion/InputStreamWrapper.java
rename to test/software/amazon/ion/InputStreamWrapper.java
index 5284d40d7d..29ceeba5d2 100644
--- a/test/com/amazon/ion/InputStreamWrapper.java
+++ b/test/software/amazon/ion/InputStreamWrapper.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/IntTest.java b/test/software/amazon/ion/IntTest.java
similarity index 99%
rename from test/com/amazon/ion/IntTest.java
rename to test/software/amazon/ion/IntTest.java
index d21e29042c..9af4515fed 100644
--- a/test/com/amazon/ion/IntTest.java
+++ b/test/software/amazon/ion/IntTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/IonExceptionTest.java b/test/software/amazon/ion/IonExceptionTest.java
similarity index 99%
rename from test/com/amazon/ion/IonExceptionTest.java
rename to test/software/amazon/ion/IonExceptionTest.java
index dd7c18b089..4f34ed9cfc 100644
--- a/test/com/amazon/ion/IonExceptionTest.java
+++ b/test/software/amazon/ion/IonExceptionTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
diff --git a/test/com/amazon/ion/IonRawWriterBasicTest.java b/test/software/amazon/ion/IonRawWriterBasicTest.java
similarity index 95%
rename from test/com/amazon/ion/IonRawWriterBasicTest.java
rename to test/software/amazon/ion/IonRawWriterBasicTest.java
index 2e66170fa1..8ce6ff5263 100644
--- a/test/com/amazon/ion/IonRawWriterBasicTest.java
+++ b/test/software/amazon/ion/IonRawWriterBasicTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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 software.amazon.ion.facet.Facets;
+import software.amazon.ion.impl.bin._Private_IonManagedWriter;
+import software.amazon.ion.impl.bin._Private_IonRawWriter;
+import software.amazon.ion.system.IonReaderBuilder;
+import software.amazon.ion.system.IonSystemBuilder;
+import software.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/test/com/amazon/ion/IonRawWriterSymbolsTest.java b/test/software/amazon/ion/IonRawWriterSymbolsTest.java
similarity index 97%
rename from test/com/amazon/ion/IonRawWriterSymbolsTest.java
rename to test/software/amazon/ion/IonRawWriterSymbolsTest.java
index d9767d6857..5350605951 100644
--- a/test/com/amazon/ion/IonRawWriterSymbolsTest.java
+++ b/test/software/amazon/ion/IonRawWriterSymbolsTest.java
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.IonRawWriterBasicTest.getStrings;
+import static software.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 software.amazon.ion.IonRawWriterBasicTest.Roundtrip;
+import software.amazon.ion.impl.bin._Private_IonManagedWriter;
+import software.amazon.ion.impl.bin._Private_IonRawWriter;
+import software.amazon.ion.junit.Injected;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.system.IonSystemBuilder;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/test/com/amazon/ion/IonReaderToIonValueTest.java b/test/software/amazon/ion/IonReaderToIonValueTest.java
similarity index 97%
rename from test/com/amazon/ion/IonReaderToIonValueTest.java
rename to test/software/amazon/ion/IonReaderToIonValueTest.java
index c6789c925a..d00fd87981 100644
--- a/test/com/amazon/ion/IonReaderToIonValueTest.java
+++ b/test/software/amazon/ion/IonReaderToIonValueTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/IonSystemTest.java b/test/software/amazon/ion/IonSystemTest.java
similarity index 98%
rename from test/com/amazon/ion/IonSystemTest.java
rename to test/software/amazon/ion/IonSystemTest.java
index 9aa5df6ce5..a212b08584 100644
--- a/test/com/amazon/ion/IonSystemTest.java
+++ b/test/software/amazon/ion/IonSystemTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static software.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
 
-import com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/IonTestCase.java b/test/software/amazon/ion/IonTestCase.java
similarity index 98%
rename from test/com/amazon/ion/IonTestCase.java
rename to test/software/amazon/ion/IonTestCase.java
index 9c96dc2635..a7e48a73f6 100644
--- a/test/com/amazon/ion/IonTestCase.java
+++ b/test/software/amazon/ion/IonTestCase.java
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.SystemSymbols.ION_1_0;
 
-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 software.amazon.ion.impl._Private_IonSystem;
+import software.amazon.ion.junit.Injected;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
+import software.amazon.ion.system.IonSystemBuilder;
+import software.amazon.ion.system.SimpleCatalog;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/IonValueChecker.java b/test/software/amazon/ion/IonValueChecker.java
similarity index 95%
rename from test/com/amazon/ion/IonValueChecker.java
rename to test/software/amazon/ion/IonValueChecker.java
index 27b6a7da7b..e1bf5ee41b 100644
--- a/test/com/amazon/ion/IonValueChecker.java
+++ b/test/software/amazon/ion/IonValueChecker.java
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.IonTestCase.checkSymbol;
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.IonTestCase.checkSymbol;
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/test/com/amazon/ion/IonValueDeltaGenerator.java b/test/software/amazon/ion/IonValueDeltaGenerator.java
similarity index 99%
rename from test/com/amazon/ion/IonValueDeltaGenerator.java
rename to test/software/amazon/ion/IonValueDeltaGenerator.java
index fa8394cdaf..7ab259c7c0 100644
--- a/test/com/amazon/ion/IonValueDeltaGenerator.java
+++ b/test/software/amazon/ion/IonValueDeltaGenerator.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import static junit.framework.Assert.assertTrue;
 
-import com.amazon.ion.Timestamp.Precision;
+import software.amazon.ion.Timestamp.Precision;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/software/amazon/ion/IonValueTest.java
similarity index 97%
rename from test/com/amazon/ion/IonValueTest.java
rename to test/software/amazon/ion/IonValueTest.java
index eb2a6bb111..bb45d089ad 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/software/amazon/ion/IonValueTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.junit.IonAssert.assertAnnotations;
+import static software.amazon.ion.junit.IonAssert.assertAnnotations;
 import static java.lang.String.format;
 
-import com.amazon.ion.junit.IonAssert;
-import com.amazon.ion.system.IonTextWriterBuilder;
-import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+import software.amazon.ion.junit.IonAssert;
+import software.amazon.ion.system.IonTextWriterBuilder;
+import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/IteratorSystemProcessingTestCase.java b/test/software/amazon/ion/IteratorSystemProcessingTestCase.java
similarity index 99%
rename from test/com/amazon/ion/IteratorSystemProcessingTestCase.java
rename to test/software/amazon/ion/IteratorSystemProcessingTestCase.java
index 5ac1a21d8a..a12f6c05f2 100644
--- a/test/com/amazon/ion/IteratorSystemProcessingTestCase.java
+++ b/test/software/amazon/ion/IteratorSystemProcessingTestCase.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.Iterator;
 
diff --git a/test/com/amazon/ion/JavaNumericsTest.java b/test/software/amazon/ion/JavaNumericsTest.java
similarity index 99%
rename from test/com/amazon/ion/JavaNumericsTest.java
rename to test/software/amazon/ion/JavaNumericsTest.java
index 381174f1be..7036ba730b 100644
--- a/test/com/amazon/ion/JavaNumericsTest.java
+++ b/test/software/amazon/ion/JavaNumericsTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java b/test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
index 5b044d2af5..7f44732b69 100644
--- a/test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.io.Reader;
 import java.io.StringReader;
diff --git a/test/com/amazon/ion/ListTest.java b/test/software/amazon/ion/ListTest.java
similarity index 99%
rename from test/com/amazon/ion/ListTest.java
rename to test/software/amazon/ion/ListTest.java
index 43c74fa408..24b2597596 100644
--- a/test/com/amazon/ion/ListTest.java
+++ b/test/software/amazon/ion/ListTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java b/test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
rename to test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
index d90dffb0e2..dd9d7ac6c5 100644
--- a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
+++ b/test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 
diff --git a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java b/test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
rename to test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
index d938fd9a3b..2591ee129a 100644
--- a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
+++ b/test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java b/test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java
similarity index 93%
rename from test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
rename to test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java
index c8b432d5d6..93b47364cb 100644
--- a/test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
+++ b/test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 
 
 
diff --git a/test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java b/test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java
similarity index 94%
rename from test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
rename to test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java
index 4d3ed3c2b2..f62efa4279 100644
--- a/test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
+++ b/test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
diff --git a/test/com/amazon/ion/LoaderTest.java b/test/software/amazon/ion/LoaderTest.java
similarity index 98%
rename from test/com/amazon/ion/LoaderTest.java
rename to test/software/amazon/ion/LoaderTest.java
index fc020077a4..c6988a4872 100644
--- a/test/com/amazon/ion/LoaderTest.java
+++ b/test/software/amazon/ion/LoaderTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 static software.amazon.ion.SystemSymbols.ION_1_0;
+import static software.amazon.ion.impl._Private_Utils.UTF8_CHARSET;
+import static software.amazon.ion.impl._Private_Utils.utf8;
 
-import com.amazon.ion.impl.Symtabs;
-import com.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.impl.Symtabs;
+import software.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/test/com/amazon/ion/LongStringTest.java b/test/software/amazon/ion/LongStringTest.java
similarity index 96%
rename from test/com/amazon/ion/LongStringTest.java
rename to test/software/amazon/ion/LongStringTest.java
index f7454932ef..3dd96a6fb0 100644
--- a/test/com/amazon/ion/LongStringTest.java
+++ b/test/software/amazon/ion/LongStringTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 public class LongStringTest
diff --git a/test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java b/test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
similarity index 98%
rename from test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
index 3674699150..b7fb14ef47 100644
--- a/test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.Iterator;
 
diff --git a/test/com/amazon/ion/NonEquivsTest.java b/test/software/amazon/ion/NonEquivsTest.java
similarity index 80%
rename from test/com/amazon/ion/NonEquivsTest.java
rename to test/software/amazon/ion/NonEquivsTest.java
index f8a38ab7ea..52bf986225 100644
--- a/test/com/amazon/ion/NonEquivsTest.java
+++ b/test/software/amazon/ion/NonEquivsTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static com.amazon.ion.TestUtils.NON_EQUIVS_IONTESTS_FILEs;
+import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static software.amazon.ion.TestUtils.NON_EQUIVS_IONTESTS_FILEs;
 
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 
 public class NonEquivsTest
diff --git a/test/com/amazon/ion/NopPaddingTest.java b/test/software/amazon/ion/NopPaddingTest.java
similarity index 99%
rename from test/com/amazon/ion/NopPaddingTest.java
rename to test/software/amazon/ion/NopPaddingTest.java
index 2fd7fa3555..4dcaae2710 100644
--- a/test/com/amazon/ion/NopPaddingTest.java
+++ b/test/software/amazon/ion/NopPaddingTest.java
@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/NullTest.java b/test/software/amazon/ion/NullTest.java
similarity index 98%
rename from test/com/amazon/ion/NullTest.java
rename to test/software/amazon/ion/NullTest.java
index aa0c4d770e..f456b03314 100644
--- a/test/com/amazon/ion/NullTest.java
+++ b/test/software/amazon/ion/NullTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.Iterator;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java b/test/software/amazon/ion/RawValueSpanReaderBasicTest.java
similarity index 98%
rename from test/com/amazon/ion/RawValueSpanReaderBasicTest.java
rename to test/software/amazon/ion/RawValueSpanReaderBasicTest.java
index f209214c13..1511d5f6dc 100644
--- a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
+++ b/test/software/amazon/ion/RawValueSpanReaderBasicTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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 software.amazon.ion.system.IonReaderBuilder;
 import java.io.ByteArrayInputStream;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/test/com/amazon/ion/ReaderChecker.java b/test/software/amazon/ion/ReaderChecker.java
similarity index 94%
rename from test/com/amazon/ion/ReaderChecker.java
rename to test/software/amazon/ion/ReaderChecker.java
index 7905173d80..30b24be682 100644
--- a/test/com/amazon/ion/ReaderChecker.java
+++ b/test/software/amazon/ion/ReaderChecker.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.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 software.amazon.ion.IonTestCase.checkSymbol;
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.impl._Private_Utils.stringIterator;
+import static software.amazon.ion.junit.IonAssert.assertIteratorEquals;
+import static software.amazon.ion.junit.IonAssert.assertSymbolEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/test/com/amazon/ion/ReaderMaker.java b/test/software/amazon/ion/ReaderMaker.java
similarity index 97%
rename from test/com/amazon/ion/ReaderMaker.java
rename to test/software/amazon/ion/ReaderMaker.java
index ff5cc88fb7..46c3d9f42f 100644
--- a/test/com/amazon/ion/ReaderMaker.java
+++ b/test/software/amazon/ion/ReaderMaker.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.TestUtils.ensureBinary;
-import static com.amazon.ion.TestUtils.ensureText;
+import static software.amazon.ion.TestUtils.ensureBinary;
+import static software.amazon.ion.TestUtils.ensureText;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/ReaderSystemProcessingTestCase.java b/test/software/amazon/ion/ReaderSystemProcessingTestCase.java
similarity index 97%
rename from test/com/amazon/ion/ReaderSystemProcessingTestCase.java
rename to test/software/amazon/ion/ReaderSystemProcessingTestCase.java
index de9b468221..a5e6e48d9f 100644
--- a/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
+++ b/test/software/amazon/ion/ReaderSystemProcessingTestCase.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 static software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static software.amazon.ion.junit.IonAssert.assertNoCurrentValue;
+import static software.amazon.ion.junit.IonAssert.expectNextField;
 
-import com.amazon.ion.junit.IonAssert;
+import software.amazon.ion.junit.IonAssert;
 import java.util.Date;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/software/amazon/ion/RoundTripTest.java
similarity index 93%
rename from test/com/amazon/ion/RoundTripTest.java
rename to test/software/amazon/ion/RoundTripTest.java
index 650bf5cac0..a1f5dc66fd 100644
--- a/test/com/amazon/ion/RoundTripTest.java
+++ b/test/software/amazon/ion/RoundTripTest.java
@@ -13,21 +13,21 @@
  * 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.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;
+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;
+
+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;
+import software.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/test/com/amazon/ion/SequenceTestCase.java b/test/software/amazon/ion/SequenceTestCase.java
similarity index 99%
rename from test/com/amazon/ion/SequenceTestCase.java
rename to test/software/amazon/ion/SequenceTestCase.java
index 41e8a2af6a..ce894e9cf2 100644
--- a/test/com/amazon/ion/SequenceTestCase.java
+++ b/test/software/amazon/ion/SequenceTestCase.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/test/com/amazon/ion/SexpTest.java b/test/software/amazon/ion/SexpTest.java
similarity index 99%
rename from test/com/amazon/ion/SexpTest.java
rename to test/software/amazon/ion/SexpTest.java
index 18ceca29e6..cb20ccb617 100644
--- a/test/com/amazon/ion/SexpTest.java
+++ b/test/software/amazon/ion/SexpTest.java
@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/test/com/amazon/ion/SharedSymtabMaker.java b/test/software/amazon/ion/SharedSymtabMaker.java
similarity index 95%
rename from test/com/amazon/ion/SharedSymtabMaker.java
rename to test/software/amazon/ion/SharedSymtabMaker.java
index 6b5e031690..0052439ed2 100644
--- a/test/com/amazon/ion/SharedSymtabMaker.java
+++ b/test/software/amazon/ion/SharedSymtabMaker.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.impl.Symtabs.sharedSymtabStruct;
+import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
 import static junit.framework.Assert.assertSame;
 
-import com.amazon.ion.impl._Private_IonSystem;
+import software.amazon.ion.impl._Private_IonSystem;
 
 /**
  * Abstracts the various ways that a shared {@link SymbolTable} can be created
diff --git a/test/com/amazon/ion/StringFieldNameEscapesTest.java b/test/software/amazon/ion/StringFieldNameEscapesTest.java
similarity index 97%
rename from test/com/amazon/ion/StringFieldNameEscapesTest.java
rename to test/software/amazon/ion/StringFieldNameEscapesTest.java
index 96e3f0e387..f96aec7e65 100644
--- a/test/com/amazon/ion/StringFieldNameEscapesTest.java
+++ b/test/software/amazon/ion/StringFieldNameEscapesTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 public class StringFieldNameEscapesTest
diff --git a/test/com/amazon/ion/StringTest.java b/test/software/amazon/ion/StringTest.java
similarity index 99%
rename from test/com/amazon/ion/StringTest.java
rename to test/software/amazon/ion/StringTest.java
index 79dff34f14..0a21b7e8b9 100644
--- a/test/com/amazon/ion/StringTest.java
+++ b/test/software/amazon/ion/StringTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/StructTest.java b/test/software/amazon/ion/StructTest.java
similarity index 99%
rename from test/com/amazon/ion/StructTest.java
rename to test/software/amazon/ion/StructTest.java
index 88861772ae..9a730b3155 100644
--- a/test/com/amazon/ion/StructTest.java
+++ b/test/software/amazon/ion/StructTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
-import com.amazon.ion.impl._Private_IonValue;
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_IonValue;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/test/com/amazon/ion/SurrogateEscapeTest.java b/test/software/amazon/ion/SurrogateEscapeTest.java
similarity index 97%
rename from test/com/amazon/ion/SurrogateEscapeTest.java
rename to test/software/amazon/ion/SurrogateEscapeTest.java
index 86170ae471..7ae13d260b 100644
--- a/test/com/amazon/ion/SurrogateEscapeTest.java
+++ b/test/software/amazon/ion/SurrogateEscapeTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/SymbolTest.java b/test/software/amazon/ion/SymbolTest.java
similarity index 97%
rename from test/com/amazon/ion/SymbolTest.java
rename to test/software/amazon/ion/SymbolTest.java
index 9a44d1d3ad..0de3746645 100644
--- a/test/com/amazon/ion/SymbolTest.java
+++ b/test/software/amazon/ion/SymbolTest.java
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.impl._Private_Utils.newSymbolToken;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/SystemProcessingTestCase.java b/test/software/amazon/ion/SystemProcessingTestCase.java
similarity index 98%
rename from test/com/amazon/ion/SystemProcessingTestCase.java
rename to test/software/amazon/ion/SystemProcessingTestCase.java
index 6fce2cee24..19be089a50 100644
--- a/test/com/amazon/ion/SystemProcessingTestCase.java
+++ b/test/software/amazon/ion/SystemProcessingTestCase.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
-
-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;
+package software.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 software.amazon.ion.impl.SymbolTableTest;
+import software.amazon.ion.impl.Symtabs;
+import software.amazon.ion.system.SimpleCatalog;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/SystemProcessingTests.java b/test/software/amazon/ion/SystemProcessingTests.java
similarity index 98%
rename from test/com/amazon/ion/SystemProcessingTests.java
rename to test/software/amazon/ion/SystemProcessingTests.java
index 64e77e7f40..bf501f03ad 100644
--- a/test/com/amazon/ion/SystemProcessingTests.java
+++ b/test/software/amazon/ion/SystemProcessingTests.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/test/com/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
similarity index 98%
rename from test/com/amazon/ion/TestUtils.java
rename to test/software/amazon/ion/TestUtils.java
index c5fbfb2e76..0961015e80 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import static com.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
+import static software.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
 
-import com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.util.IonStreamUtils;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.util.IonStreamUtils;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.math.BigDecimal;
diff --git a/test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java b/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
similarity index 93%
rename from test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
index be8ae0ef70..95e0f6dd0a 100644
--- a/test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.util.Iterator;
 
 
diff --git a/test/com/amazon/ion/TextIteratorSystemProcessingTest.java b/test/software/amazon/ion/TextIteratorSystemProcessingTest.java
similarity index 93%
rename from test/com/amazon/ion/TextIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/TextIteratorSystemProcessingTest.java
index f16da9245d..6a9058e407 100644
--- a/test/com/amazon/ion/TextIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextIteratorSystemProcessingTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_IonSystem;
+import software.amazon.ion.impl._Private_IonSystem;
 import java.util.Iterator;
 
 
diff --git a/test/com/amazon/ion/TextReaderSystemProcessingTest.java b/test/software/amazon/ion/TextReaderSystemProcessingTest.java
similarity index 97%
rename from test/com/amazon/ion/TextReaderSystemProcessingTest.java
rename to test/software/amazon/ion/TextReaderSystemProcessingTest.java
index 2e04b88abf..eaeaf57f51 100644
--- a/test/com/amazon/ion/TextReaderSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextReaderSystemProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 
 
diff --git a/test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java b/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
similarity index 94%
rename from test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
rename to test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
index 87a92b25da..285d7ffc09 100644
--- a/test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Iterator;
diff --git a/test/com/amazon/ion/TextTestCase.java b/test/software/amazon/ion/TextTestCase.java
similarity index 98%
rename from test/com/amazon/ion/TextTestCase.java
rename to test/software/amazon/ion/TextTestCase.java
index 6f5e3927b7..3c35446272 100644
--- a/test/com/amazon/ion/TextTestCase.java
+++ b/test/software/amazon/ion/TextTestCase.java
@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/TimestampBadTest.java b/test/software/amazon/ion/TimestampBadTest.java
similarity index 84%
rename from test/com/amazon/ion/TimestampBadTest.java
rename to test/software/amazon/ion/TimestampBadTest.java
index ede4ad4144..57f8374186 100644
--- a/test/com/amazon/ion/TimestampBadTest.java
+++ b/test/software/amazon/ion/TimestampBadTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 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 com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/TimestampGoodTest.java b/test/software/amazon/ion/TimestampGoodTest.java
similarity index 88%
rename from test/com/amazon/ion/TimestampGoodTest.java
rename to test/software/amazon/ion/TimestampGoodTest.java
index e5c2167fc2..a441248a0e 100644
--- a/test/com/amazon/ion/TimestampGoodTest.java
+++ b/test/software/amazon/ion/TimestampGoodTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-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 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 com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
similarity index 99%
rename from test/com/amazon/ion/TimestampTest.java
rename to test/software/amazon/ion/TimestampTest.java
index eef97cb463..fe49cc5326 100644
--- a/test/com/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -13,25 +13,25 @@
  * permissions and limitations under the License.
  */
 
-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;
+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.FRACTION;
+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._Private_Utils.UTC;
+
+import software.amazon.ion.Timestamp.Precision;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
diff --git a/test/com/amazon/ion/TrBwBrProcessingTest.java b/test/software/amazon/ion/TrBwBrProcessingTest.java
similarity index 98%
rename from test/com/amazon/ion/TrBwBrProcessingTest.java
rename to test/software/amazon/ion/TrBwBrProcessingTest.java
index f49cfca0d5..e206640b10 100644
--- a/test/com/amazon/ion/TrBwBrProcessingTest.java
+++ b/test/software/amazon/ion/TrBwBrProcessingTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/TrueSequenceTestCase.java b/test/software/amazon/ion/TrueSequenceTestCase.java
similarity index 99%
rename from test/com/amazon/ion/TrueSequenceTestCase.java
rename to test/software/amazon/ion/TrueSequenceTestCase.java
index 22ef0a8708..9a93ac37dd 100644
--- a/test/com/amazon/ion/TrueSequenceTestCase.java
+++ b/test/software/amazon/ion/TrueSequenceTestCase.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.impl._Private_IonValue;
+import software.amazon.ion.impl._Private_IonValue;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/test/com/amazon/ion/ValueFactorySequenceTest.java b/test/software/amazon/ion/ValueFactorySequenceTest.java
similarity index 98%
rename from test/com/amazon/ion/ValueFactorySequenceTest.java
rename to test/software/amazon/ion/ValueFactorySequenceTest.java
index 63d227eab9..1810c99540 100644
--- a/test/com/amazon/ion/ValueFactorySequenceTest.java
+++ b/test/software/amazon/ion/ValueFactorySequenceTest.java
@@ -14,9 +14,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion;
+package software.amazon.ion;
 
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.Injected.Inject;
 import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/facet/FacetsTest.java b/test/software/amazon/ion/facet/FacetsTest.java
similarity index 96%
rename from test/com/amazon/ion/facet/FacetsTest.java
rename to test/software/amazon/ion/facet/FacetsTest.java
index 27d2b0e359..9f7d54ce6d 100644
--- a/test/com/amazon/ion/facet/FacetsTest.java
+++ b/test/software/amazon/ion/facet/FacetsTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.facet;
+package software.amazon.ion.facet;
 
-import static com.amazon.ion.facet.Facets.asFacet;
-import static com.amazon.ion.facet.Facets.assumeFacet;
+import static software.amazon.ion.facet.Facets.asFacet;
+import static software.amazon.ion.facet.Facets.assumeFacet;
 import static org.junit.Assert.assertSame;
 
-import com.amazon.ion.Span;
+import software.amazon.ion.Span;
 import org.junit.Test;
 
 
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/software/amazon/ion/impl/BinaryWriterTest.java
similarity index 95%
rename from test/com/amazon/ion/impl/BinaryWriterTest.java
rename to test/software/amazon/ion/impl/BinaryWriterTest.java
index f2d287859f..ad9412b1d6 100644
--- a/test/com/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/BinaryWriterTest.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.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 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;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java b/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
similarity index 93%
rename from test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
rename to test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
index debc65c925..927b9e9e8d 100644
--- a/test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
+++ b/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
-
-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;
+package software.amazon.ion.impl;
+
+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 software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+
+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;
 import java.io.ByteArrayOutputStream;
 import org.junit.After;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/ByteBufferTest.java b/test/software/amazon/ion/impl/ByteBufferTest.java
similarity index 98%
rename from test/com/amazon/ion/impl/ByteBufferTest.java
rename to test/software/amazon/ion/impl/ByteBufferTest.java
index aa93de6494..9586cb9379 100644
--- a/test/com/amazon/ion/impl/ByteBufferTest.java
+++ b/test/software/amazon/ion/impl/ByteBufferTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonTestCase;
-import com.amazon.ion.impl.IonBinary.BufferManager;
+import software.amazon.ion.IonException;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.impl.IonBinary.BufferManager;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/com/amazon/ion/impl/CharacterReaderTest.java b/test/software/amazon/ion/impl/CharacterReaderTest.java
similarity index 99%
rename from test/com/amazon/ion/impl/CharacterReaderTest.java
rename to test/software/amazon/ion/impl/CharacterReaderTest.java
index 6181a7ac47..2a106b1a48 100644
--- a/test/com/amazon/ion/impl/CharacterReaderTest.java
+++ b/test/software/amazon/ion/impl/CharacterReaderTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonTestCase;
+import software.amazon.ion.IonTestCase;
 import java.io.IOException;
 import java.io.StringReader;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/EscapingCallback.java b/test/software/amazon/ion/impl/EscapingCallback.java
similarity index 96%
rename from test/com/amazon/ion/impl/EscapingCallback.java
rename to test/software/amazon/ion/impl/EscapingCallback.java
index 8f49d57e4f..639ed8af8f 100644
--- a/test/com/amazon/ion/impl/EscapingCallback.java
+++ b/test/software/amazon/ion/impl/EscapingCallback.java
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonType;
-import com.amazon.ion.util._Private_FastAppendable;
+import software.amazon.ion.IonType;
+import software.amazon.ion.util._Private_FastAppendable;
 import java.io.IOException;
 
 class EscapingCallback
diff --git a/test/com/amazon/ion/impl/IonImplUtilsTest.java b/test/software/amazon/ion/impl/IonImplUtilsTest.java
similarity index 97%
rename from test/com/amazon/ion/impl/IonImplUtilsTest.java
rename to test/software/amazon/ion/impl/IonImplUtilsTest.java
index 3ff9ac9afd..0c42fce273 100644
--- a/test/com/amazon/ion/impl/IonImplUtilsTest.java
+++ b/test/software/amazon/ion/impl/IonImplUtilsTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java b/test/software/amazon/ion/impl/IonMarkupWriterFilesTest.java
similarity index 82%
rename from test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
rename to test/software/amazon/ion/impl/IonMarkupWriterFilesTest.java
index 8c86e1e1d7..d817e713fe 100644
--- a/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
+++ b/test/software/amazon/ion/impl/IonMarkupWriterFilesTest.java
@@ -14,18 +14,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.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 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 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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.system.IonTextWriterBuilder;
+import software.amazon.ion.util.NullOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/software/amazon/ion/impl/IonMarkupWriterTest.java
similarity index 97%
rename from test/com/amazon/ion/impl/IonMarkupWriterTest.java
rename to test/software/amazon/ion/impl/IonMarkupWriterTest.java
index b84d7a7da0..f812116822 100644
--- a/test/com/amazon/ion/impl/IonMarkupWriterTest.java
+++ b/test/software/amazon/ion/impl/IonMarkupWriterTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.system.IonTextWriterBuilder;
 import java.io.IOException;
 import java.io.StringWriter;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java b/test/software/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
similarity index 89%
rename from test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
rename to test/software/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
index 9ed965105a..c55c9c4f82 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
+++ b/test/software/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
@@ -1,12 +1,12 @@
-package com.amazon.ion.impl;
+package software.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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.Timestamp;
+import software.amazon.ion.system.IonBinaryWriterBuilder;
+import software.amazon.ion.system.IonReaderBuilder;
+import software.amazon.ion.util.RepeatInputStream;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -15,7 +15,7 @@
 import java.io.SequenceInputStream;
 import java.math.BigDecimal;
 
-import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static software.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
 import static org.junit.Assert.assertEquals;
 
 public class IonReaderBinaryRawLargeStreamTest {
diff --git a/test/com/amazon/ion/impl/IonUTF8Test.java b/test/software/amazon/ion/impl/IonUTF8Test.java
similarity index 99%
rename from test/com/amazon/ion/impl/IonUTF8Test.java
rename to test/software/amazon/ion/impl/IonUTF8Test.java
index 0457d423be..756c352ef4 100644
--- a/test/com/amazon/ion/impl/IonUTF8Test.java
+++ b/test/software/amazon/ion/impl/IonUTF8Test.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/software/amazon/ion/impl/IonWriterTestCase.java
similarity index 95%
rename from test/com/amazon/ion/impl/IonWriterTestCase.java
rename to test/software/amazon/ion/impl/IonWriterTestCase.java
index e13ff69dcf..fbf87e1018 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/software/amazon/ion/impl/IonWriterTestCase.java
@@ -13,42 +13,42 @@
  * permissions and limitations under the License.
  */
 
-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;
+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.Symtabs.FRED_MAX_IDS;
+import static software.amazon.ion.impl._Private_IonWriterBase.ERROR_MISSING_FIELD_NAME;
+import static software.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+import static software.amazon.ion.junit.IonAssert.expectNextField;
+
+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.junit.IonAssert;
+import software.amazon.ion.system.IonSystemBuilder;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/test/com/amazon/ion/impl/IonWriterTests.java b/test/software/amazon/ion/impl/IonWriterTests.java
similarity index 96%
rename from test/com/amazon/ion/impl/IonWriterTests.java
rename to test/software/amazon/ion/impl/IonWriterTests.java
index a3a3e6b806..c8894a9277 100644
--- a/test/com/amazon/ion/impl/IonWriterTests.java
+++ b/test/software/amazon/ion/impl/IonWriterTests.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/test/com/amazon/ion/impl/IterationTest.java b/test/software/amazon/ion/impl/IterationTest.java
similarity index 93%
rename from test/com/amazon/ion/impl/IterationTest.java
rename to test/software/amazon/ion/impl/IterationTest.java
index 483b4557ef..f2f091fe00 100644
--- a/test/com/amazon/ion/impl/IterationTest.java
+++ b/test/software/amazon/ion/impl/IterationTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonSymbol;
-import com.amazon.ion.IonTestCase;
-import com.amazon.ion.IonValue;
+import software.amazon.ion.IonSymbol;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonValue;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/LocalSymbolTableTest.java b/test/software/amazon/ion/impl/LocalSymbolTableTest.java
similarity index 94%
rename from test/com/amazon/ion/impl/LocalSymbolTableTest.java
rename to test/software/amazon/ion/impl/LocalSymbolTableTest.java
index d7cddcd594..48334f632e 100644
--- a/test/com/amazon/ion/impl/LocalSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/LocalSymbolTableTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
-
-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;
+package software.amazon.ion.impl;
+
+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 software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static software.amazon.ion.impl._Private_Utils.copyLocalSymbolTable;
+
+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 org.junit.Test;
 
 
diff --git a/test/com/amazon/ion/impl/OldBinaryWriterTest.java b/test/software/amazon/ion/impl/OldBinaryWriterTest.java
similarity index 89%
rename from test/com/amazon/ion/impl/OldBinaryWriterTest.java
rename to test/software/amazon/ion/impl/OldBinaryWriterTest.java
index 1c7aee2d38..16b99f6579 100644
--- a/test/com/amazon/ion/impl/OldBinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/OldBinaryWriterTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonBinaryWriter;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.SymbolTable;
+import software.amazon.ion.IonBinaryWriter;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.SymbolTable;
 
 
 @SuppressWarnings("deprecation")
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java b/test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
similarity index 94%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
rename to test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
index 002ac1aaa4..a6071cbea7 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
+++ b/test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
-
-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;
+package software.amazon.ion.impl;
+
+import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+
+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;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
similarity index 95%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
rename to test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
index 850fa54ac4..4e61eff4ea 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-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 static software.amazon.ion.impl.Symtabs.printLocalSymtab;
+import static software.amazon.ion.impl._Private_Utils.isNonSymbolScalar;
+import static software.amazon.ion.impl._Private_Utils.symtabExtends;
+import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+import static software.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
 
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonType;
-import com.amazon.ion.SymbolTable;
+import software.amazon.ion.IonDatagram;
+import software.amazon.ion.IonType;
+import software.amazon.ion.SymbolTable;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
similarity index 92%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
rename to test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index 684c8a3eaf..89b1b7e091 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static com.amazon.ion.impl.Symtabs.makeLocalSymtab;
+import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
 import static java.lang.reflect.Proxy.newProxyInstance;
 
-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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.system.IonBinaryWriterBuilder;
+import software.amazon.ion.system.IonSystemBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
diff --git a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
similarity index 96%
rename from test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
rename to test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
index acc7c010a8..e3dba317cd 100644
--- a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
+++ b/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.impl;
+
+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;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java b/test/software/amazon/ion/impl/RawValueSpanReaderTest.java
similarity index 93%
rename from test/com/amazon/ion/impl/RawValueSpanReaderTest.java
rename to test/software/amazon/ion/impl/RawValueSpanReaderTest.java
index e99ee79569..adc9d8c4d4 100644
--- a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
+++ b/test/software/amazon/ion/impl/RawValueSpanReaderTest.java
@@ -13,26 +13,26 @@
  * 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;
+package software.amazon.ion.impl;
+
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.OffsetSpan;
+import software.amazon.ion.RawValueSpanProvider;
+import software.amazon.ion.RawValueSpanReaderBasicTest;
+import software.amazon.ion.SeekableReader;
+import software.amazon.ion.Span;
+import software.amazon.ion.SymbolToken;
+import software.amazon.ion.TestUtils;
+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 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 software.amazon.ion.junit.Injected;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.system.IonReaderBuilder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
diff --git a/test/com/amazon/ion/impl/SharedSymbolTableTest.java b/test/software/amazon/ion/impl/SharedSymbolTableTest.java
similarity index 93%
rename from test/com/amazon/ion/impl/SharedSymbolTableTest.java
rename to test/software/amazon/ion/impl/SharedSymbolTableTest.java
index 34bfab7582..978c873821 100644
--- a/test/com/amazon/ion/impl/SharedSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/SharedSymbolTableTest.java
@@ -13,24 +13,24 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.impl;
+
+import static software.amazon.ion.impl.SymbolTableTest.checkSharedTable;
+import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
+import static software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static software.amazon.ion.impl._Private_Utils.stringIterator;
+
+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;
 import java.io.IOException;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/software/amazon/ion/impl/SymbolTableTest.java
similarity index 96%
rename from test/com/amazon/ion/impl/SymbolTableTest.java
rename to test/software/amazon/ion/impl/SymbolTableTest.java
index 3c62543709..388b3f2287 100644
--- a/test/com/amazon/ion/impl/SymbolTableTest.java
+++ b/test/software/amazon/ion/impl/SymbolTableTest.java
@@ -13,45 +13,45 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.impl;
+
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import software.amazon.ion.SymbolToken;
+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.Symtabs.printLocalSymtab;
+import static software.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static software.amazon.ion.impl._Private_Utils.stringIterator;
+import static software.amazon.ion.impl._Private_Utils.symtabTree;
+
+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.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;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/test/com/amazon/ion/impl/Symtabs.java b/test/software/amazon/ion/impl/Symtabs.java
similarity index 92%
rename from test/com/amazon/ion/impl/Symtabs.java
rename to test/software/amazon/ion/impl/Symtabs.java
index f1a78a22df..3ec1d6e80d 100644
--- a/test/com/amazon/ion/impl/Symtabs.java
+++ b/test/software/amazon/ion/impl/Symtabs.java
@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.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 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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-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 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.system.IonSystemBuilder;
+import software.amazon.ion.system.SimpleCatalog;
 import java.io.IOException;
 import java.util.Arrays;
 
diff --git a/test/com/amazon/ion/impl/TestMarkupCallback.java b/test/software/amazon/ion/impl/TestMarkupCallback.java
similarity index 95%
rename from test/com/amazon/ion/impl/TestMarkupCallback.java
rename to test/software/amazon/ion/impl/TestMarkupCallback.java
index 86187004ff..0a23262d7c 100644
--- a/test/com/amazon/ion/impl/TestMarkupCallback.java
+++ b/test/software/amazon/ion/impl/TestMarkupCallback.java
@@ -14,11 +14,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
-import com.amazon.ion.IonType;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.util._Private_FastAppendable;
+import software.amazon.ion.IonType;
+import software.amazon.ion.SymbolToken;
+import software.amazon.ion.util._Private_FastAppendable;
 import java.io.IOException;
 import org.junit.Assert;
 
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/software/amazon/ion/impl/TextWriterTest.java
similarity index 94%
rename from test/com/amazon/ion/impl/TextWriterTest.java
rename to test/software/amazon/ion/impl/TextWriterTest.java
index ba57d634bf..497962d71c 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/software/amazon/ion/impl/TextWriterTest.java
@@ -13,25 +13,25 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.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 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 static java.lang.String.format;
 
-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 software.amazon.ion.IonBinaryWriter;
+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.system.IonTextWriterBuilder;
+import software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
+import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
 import java.io.OutputStream;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/impl/TreeReaderTest.java b/test/software/amazon/ion/impl/TreeReaderTest.java
similarity index 83%
rename from test/com/amazon/ion/impl/TreeReaderTest.java
rename to test/software/amazon/ion/impl/TreeReaderTest.java
index 34af455227..1accf5c1d3 100644
--- a/test/com/amazon/ion/impl/TreeReaderTest.java
+++ b/test/software/amazon/ion/impl/TreeReaderTest.java
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
-
-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;
+package software.amazon.ion.impl;
+
+import static software.amazon.ion.junit.IonAssert.assertTopLevel;
+
+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;
 import org.junit.Test;
 
 
diff --git a/test/com/amazon/ion/impl/UnifiedInputStreamXTest.java b/test/software/amazon/ion/impl/UnifiedInputStreamXTest.java
similarity index 98%
rename from test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
rename to test/software/amazon/ion/impl/UnifiedInputStreamXTest.java
index e353b49e19..981aca4094 100644
--- a/test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
+++ b/test/software/amazon/ion/impl/UnifiedInputStreamXTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/impl/ValueWriterTest.java b/test/software/amazon/ion/impl/ValueWriterTest.java
similarity index 92%
rename from test/com/amazon/ion/impl/ValueWriterTest.java
rename to test/software/amazon/ion/impl/ValueWriterTest.java
index 730ce7158e..f706eccd63 100644
--- a/test/com/amazon/ion/impl/ValueWriterTest.java
+++ b/test/software/amazon/ion/impl/ValueWriterTest.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.impl;
+
+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;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/impl/VarIntTest.java b/test/software/amazon/ion/impl/VarIntTest.java
similarity index 96%
rename from test/com/amazon/ion/impl/VarIntTest.java
rename to test/software/amazon/ion/impl/VarIntTest.java
index 1e297b317b..8392af5a8b 100644
--- a/test/com/amazon/ion/impl/VarIntTest.java
+++ b/test/software/amazon/ion/impl/VarIntTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import org.junit.Test;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonTestCase;
-import com.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.IonException;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.system.SimpleCatalog;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java b/test/software/amazon/ion/impl/_Private_ScalarConversionsTest.java
similarity index 95%
rename from test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
rename to test/software/amazon/ion/impl/_Private_ScalarConversionsTest.java
index c607cbb891..3e97327e21 100644
--- a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
+++ b/test/software/amazon/ion/impl/_Private_ScalarConversionsTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl;
+package software.amazon.ion.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Assert;
 import org.junit.Test;
-import com.amazon.ion.Decimal;
+import software.amazon.ion.Decimal;
 import static org.junit.Assert.*;
 
 public class _Private_ScalarConversionsTest {
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
similarity index 91%
rename from test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
rename to test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index b83bbbd2e1..5d0cbeb3af 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -13,24 +13,24 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.bin;
+package software.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 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.IonManagedBinaryWriter.ImportedSymbolResolverMode;
+import software.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder.AllocatorMode;
+import software.amazon.ion.junit.Injected.Inject;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
similarity index 87%
rename from test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
rename to test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
index 7d23e59afc..07b2dd76f5 100644
--- a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -13,43 +13,43 @@
  * permissions and limitations under the License.
  */
 
-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;
+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 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.AbstractIonWriter.WriteValueOptimization;
+import software.amazon.ion.impl.bin.IonBinaryWriterAdapter.Factory;
+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.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
+import software.amazon.ion.system.IonSystemBuilder;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
diff --git a/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java b/test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
similarity index 98%
rename from test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
rename to test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
index 97ccef5546..0a491554cc 100644
--- a/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
+++ b/test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.bin;
+package software.amazon.ion.impl.bin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/software/amazon/ion/impl/bin/WriteBufferTest.java
similarity index 99%
rename from test/com/amazon/ion/impl/bin/WriteBufferTest.java
rename to test/software/amazon/ion/impl/bin/WriteBufferTest.java
index 5a5ddb5acf..561d6e2dce 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/software/amazon/ion/impl/bin/WriteBufferTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.bin;
+package software.amazon.ion.impl.bin;
 
-import static com.amazon.ion.TestUtils.hexDump;
+import static software.amazon.ion.TestUtils.hexDump;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
similarity index 98%
rename from test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
rename to test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
index 2bc94f7cf4..a1f324ca6f 100644
--- a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
+++ b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,12 +26,12 @@
 import java.util.List;
 import java.util.ListIterator;
 import org.junit.Test;
-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;
+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
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
similarity index 90%
rename from test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
rename to test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
index 66964cbb59..461430b634 100644
--- a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
+++ b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,11 +23,11 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import org.junit.Test;
-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;
+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 BaseIonSequenceLiteTestCase {
 
diff --git a/test/com/amazon/ion/impl/lite/IonContextTest.java b/test/software/amazon/ion/impl/lite/IonContextTest.java
similarity index 95%
rename from test/com/amazon/ion/impl/lite/IonContextTest.java
rename to test/software/amazon/ion/impl/lite/IonContextTest.java
index 2b13fb554d..ac7c1fa914 100644
--- a/test/com/amazon/ion/impl/lite/IonContextTest.java
+++ b/test/software/amazon/ion/impl/lite/IonContextTest.java
@@ -13,22 +13,22 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.impl.lite;
+
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.impl.Symtabs.CATALOG;
+
+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.junit.Injected.Inject;
 import org.junit.Test;
 
 
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
similarity index 88%
rename from test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
rename to test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
index 55d9380597..eac2a5a26f 100644
--- a/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
+++ b/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonSequence;
+import software.amazon.ion.IonDatagram;
+import software.amazon.ion.IonSequence;
 
 public class IonDatagramLiteSublistTest extends BaseIonSequenceLiteSublistTestCase {
 
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
similarity index 90%
rename from test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
rename to test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
index 5ab78440ec..672d1b35b8 100644
--- a/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
-import com.amazon.ion.IonSequence;
+import software.amazon.ion.IonSequence;
 
 public class IonDatagramLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
diff --git a/test/com/amazon/ion/impl/lite/IonListLiteTest.java b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
similarity index 90%
rename from test/com/amazon/ion/impl/lite/IonListLiteTest.java
rename to test/software/amazon/ion/impl/lite/IonListLiteTest.java
index 86db62c90d..be4b8bac65 100644
--- a/test/com/amazon/ion/impl/lite/IonListLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
-import com.amazon.ion.IonSequence;
+import software.amazon.ion.IonSequence;
 
 public class IonListLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
diff --git a/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java b/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
similarity index 92%
rename from test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
rename to test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
index bd607af587..e3d26e8782 100644
--- a/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
+++ b/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,12 +22,12 @@
 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;
+import software.amazon.ion.IonInt;
+import software.amazon.ion.IonSequence;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.impl.lite.BaseIonSequenceLiteSublistTestCase;
+import software.amazon.ion.junit.Injected;
+import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * Sublist tests for list and sexp
diff --git a/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
similarity index 90%
rename from test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
rename to test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
index a8575e4705..46c7f09c5b 100644
--- a/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
-import com.amazon.ion.IonSequence;
+import software.amazon.ion.IonSequence;
 
 public class IonSexpLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
diff --git a/test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java b/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
similarity index 97%
rename from test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
rename to test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
index b17cd8a889..9864aff41b 100644
--- a/test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
+++ b/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.impl.lite;
+package software.amazon.ion.impl.lite;
 
-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 software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.UnknownSymbolException;
+import software.amazon.ion.impl._Private_Utils;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/junit/Injected.java b/test/software/amazon/ion/junit/Injected.java
similarity index 99%
rename from test/com/amazon/ion/junit/Injected.java
rename to test/software/amazon/ion/junit/Injected.java
index 1272bcc062..d33175ac0d 100644
--- a/test/com/amazon/ion/junit/Injected.java
+++ b/test/software/amazon/ion/junit/Injected.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.junit;
+package software.amazon.ion.junit;
 
 import java.beans.BeanInfo;
 import java.beans.Introspector;
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/software/amazon/ion/junit/IonAssert.java
similarity index 95%
rename from test/com/amazon/ion/junit/IonAssert.java
rename to test/software/amazon/ion/junit/IonAssert.java
index 163d5eddc2..2534a17e86 100644
--- a/test/com/amazon/ion/junit/IonAssert.java
+++ b/test/software/amazon/ion/junit/IonAssert.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.junit;
-
-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;
+package software.amazon.ion.junit;
+
+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 java.util.ArrayList;
 import java.util.HashMap;
@@ -34,9 +34,9 @@
 import java.util.Map;
 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 software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static software.amazon.ion.impl._Private_IonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
+import static software.amazon.ion.util.IonTextUtils.printSymbol;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/test/com/amazon/ion/profile/IteratorTiming.java b/test/software/amazon/ion/profile/IteratorTiming.java
similarity index 92%
rename from test/com/amazon/ion/profile/IteratorTiming.java
rename to test/software/amazon/ion/profile/IteratorTiming.java
index fd5eb3fe7e..c24742dd8b 100644
--- a/test/com/amazon/ion/profile/IteratorTiming.java
+++ b/test/software/amazon/ion/profile/IteratorTiming.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.profile;
+package software.amazon.ion.profile;
 
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.system.IonSystemBuilder;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.system.IonSystemBuilder;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/streaming/BadIonStreamingTest.java b/test/software/amazon/ion/streaming/BadIonStreamingTest.java
similarity index 78%
rename from test/com/amazon/ion/streaming/BadIonStreamingTest.java
rename to test/software/amazon/ion/streaming/BadIonStreamingTest.java
index b9dcf008c1..a1958154e7 100644
--- a/test/com/amazon/ion/streaming/BadIonStreamingTest.java
+++ b/test/software/amazon/ion/streaming/BadIonStreamingTest.java
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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 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 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 software.amazon.ion.IonException;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.TestUtils;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Ignore;
diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/test/software/amazon/ion/streaming/BinaryStreamingTest.java
similarity index 98%
rename from test/com/amazon/ion/streaming/BinaryStreamingTest.java
rename to test/software/amazon/ion/streaming/BinaryStreamingTest.java
index 05de4a40e3..b422cd495d 100644
--- a/test/com/amazon/ion/streaming/BinaryStreamingTest.java
+++ b/test/software/amazon/ion/streaming/BinaryStreamingTest.java
@@ -14,25 +14,25 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.streaming;
+
+import static software.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static software.amazon.ion.junit.IonAssert.expectField;
+
+import software.amazon.ion.Decimal;
+import software.amazon.ion.IonBinaryWriter;
+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.impl._Private_Utils;
+import software.amazon.ion.junit.IonAssert;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/streaming/GoodIonStreamingTest.java b/test/software/amazon/ion/streaming/GoodIonStreamingTest.java
similarity index 76%
rename from test/com/amazon/ion/streaming/GoodIonStreamingTest.java
rename to test/software/amazon/ion/streaming/GoodIonStreamingTest.java
index 04336f132b..8205cdbe85 100644
--- a/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
+++ b/test/software/amazon/ion/streaming/GoodIonStreamingTest.java
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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 software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static software.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 software.amazon.ion.IonReader;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.TestUtils;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/streaming/InputStreamReaderTest.java b/test/software/amazon/ion/streaming/InputStreamReaderTest.java
similarity index 86%
rename from test/com/amazon/ion/streaming/InputStreamReaderTest.java
rename to test/software/amazon/ion/streaming/InputStreamReaderTest.java
index d819d09503..fdfabb42fb 100644
--- a/test/com/amazon/ion/streaming/InputStreamReaderTest.java
+++ b/test/software/amazon/ion/streaming/InputStreamReaderTest.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
-import static com.amazon.ion.impl._Private_Utils.utf8;
+import static software.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static software.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 software.amazon.ion.InputStreamWrapper;
+import software.amazon.ion.IonType;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/streaming/MiscStreamingTest.java b/test/software/amazon/ion/streaming/MiscStreamingTest.java
similarity index 94%
rename from test/com/amazon/ion/streaming/MiscStreamingTest.java
rename to test/software/amazon/ion/streaming/MiscStreamingTest.java
index 0625fa9817..02f938d50d 100644
--- a/test/com/amazon/ion/streaming/MiscStreamingTest.java
+++ b/test/software/amazon/ion/streaming/MiscStreamingTest.java
@@ -13,24 +13,24 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.streaming;
+
+import static software.amazon.ion.impl._Private_Utils.utf8;
+
+import software.amazon.ion.BinaryTest;
+import software.amazon.ion.IonBinaryWriter;
+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;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java b/test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java
similarity index 85%
rename from test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
rename to test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java
index d5d9dfd0ea..bc52f97426 100644
--- a/test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
+++ b/test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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 software.amazon.ion.OffsetSpan;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.Span;
+import software.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/streaming/NonSeekableReaderTest.java b/test/software/amazon/ion/streaming/NonSeekableReaderTest.java
similarity index 86%
rename from test/com/amazon/ion/streaming/NonSeekableReaderTest.java
rename to test/software/amazon/ion/streaming/NonSeekableReaderTest.java
index 7c22cc9463..ca4a86cce5 100644
--- a/test/com/amazon/ion/streaming/NonSeekableReaderTest.java
+++ b/test/software/amazon/ion/streaming/NonSeekableReaderTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import com.amazon.ion.ReaderMaker;
-import com.amazon.ion.SeekableReader;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.SeekableReader;
+import software.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/streaming/NonSpanReaderTest.java b/test/software/amazon/ion/streaming/NonSpanReaderTest.java
similarity index 87%
rename from test/com/amazon/ion/streaming/NonSpanReaderTest.java
rename to test/software/amazon/ion/streaming/NonSpanReaderTest.java
index 61389988cb..078f553177 100644
--- a/test/com/amazon/ion/streaming/NonSpanReaderTest.java
+++ b/test/software/amazon/ion/streaming/NonSpanReaderTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import com.amazon.ion.ReaderMaker;
-import com.amazon.ion.SpanProvider;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.SpanProvider;
+import software.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/streaming/NonTextSpanTest.java b/test/software/amazon/ion/streaming/NonTextSpanTest.java
similarity index 85%
rename from test/com/amazon/ion/streaming/NonTextSpanTest.java
rename to test/software/amazon/ion/streaming/NonTextSpanTest.java
index d54b8188e7..d62fbc7023 100644
--- a/test/com/amazon/ion/streaming/NonTextSpanTest.java
+++ b/test/software/amazon/ion/streaming/NonTextSpanTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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 software.amazon.ion.ReaderMaker;
+import software.amazon.ion.Span;
+import software.amazon.ion.TextSpan;
+import software.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java b/test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
similarity index 89%
rename from test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
rename to test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
index 665eb853d2..0ccd9d1880 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
+++ b/test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import static com.amazon.ion.BinaryTest.hexToBytes;
+import static software.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 software.amazon.ion.IonDatagram;
+import software.amazon.ion.IonType;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.impl._Private_Utils;
+import software.amazon.ion.util.RepeatInputStream;
 import org.junit.Test;
 
 
diff --git a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java b/test/software/amazon/ion/streaming/OffsetSpanReaderTest.java
similarity index 93%
rename from test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
rename to test/software/amazon/ion/streaming/OffsetSpanReaderTest.java
index 9c62e0312f..1fc89345ab 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
+++ b/test/software/amazon/ion/streaming/OffsetSpanReaderTest.java
@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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 software.amazon.ion.BinaryTest;
+import software.amazon.ion.IonType;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.junit.Injected.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/streaming/ReaderCompare.java b/test/software/amazon/ion/streaming/ReaderCompare.java
similarity index 95%
rename from test/com/amazon/ion/streaming/ReaderCompare.java
rename to test/software/amazon/ion/streaming/ReaderCompare.java
index 2a3c68dd94..3045b6409c 100644
--- a/test/com/amazon/ion/streaming/ReaderCompare.java
+++ b/test/software/amazon/ion/streaming/ReaderCompare.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import static com.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
+import static software.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 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;
 import java.math.BigDecimal;
 import org.junit.Assert;
 
diff --git a/test/com/amazon/ion/streaming/ReaderDomCopyTest.java b/test/software/amazon/ion/streaming/ReaderDomCopyTest.java
similarity index 74%
rename from test/com/amazon/ion/streaming/ReaderDomCopyTest.java
rename to test/software/amazon/ion/streaming/ReaderDomCopyTest.java
index 4afb3ec7a4..37ffd89afe 100644
--- a/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
+++ b/test/software/amazon/ion/streaming/ReaderDomCopyTest.java
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.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.junit.IonAssert.assertIonEquals;
+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 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 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;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Test;
diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/test/software/amazon/ion/streaming/ReaderFacetTestCase.java
similarity index 90%
rename from test/com/amazon/ion/streaming/ReaderFacetTestCase.java
rename to test/software/amazon/ion/streaming/ReaderFacetTestCase.java
index bfbbeb0d78..5904d3e735 100644
--- a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
+++ b/test/software/amazon/ion/streaming/ReaderFacetTestCase.java
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
-
-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;
+package software.amazon.ion.streaming;
+
+import static software.amazon.ion.facet.Facets.assumeFacet;
+import static software.amazon.ion.util.Spans.currentSpan;
+
+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;
 import org.junit.After;
 
 
diff --git a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java
similarity index 96%
rename from test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
rename to test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java
index 983d2b23e5..7d7d0b4f07 100644
--- a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import com.amazon.ion.IntegerSize;
-import com.amazon.ion.ReaderMaker;
-import com.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.IntegerSize;
+import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.junit.Injected.Inject;
 import java.math.BigInteger;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/streaming/ReaderSkippingTest.java b/test/software/amazon/ion/streaming/ReaderSkippingTest.java
similarity index 90%
rename from test/com/amazon/ion/streaming/ReaderSkippingTest.java
rename to test/software/amazon/ion/streaming/ReaderSkippingTest.java
index 6a45032cbc..d5dae92c05 100644
--- a/test/com/amazon/ion/streaming/ReaderSkippingTest.java
+++ b/test/software/amazon/ion/streaming/ReaderSkippingTest.java
@@ -13,20 +13,20 @@
  * permissions and limitations under the License.
  */
 
-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.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;
+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.consumeCurrentValue;
+import static software.amazon.ion.TestUtils.testdataFiles;
+
+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.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Random;
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/software/amazon/ion/streaming/ReaderTest.java
similarity index 95%
rename from test/com/amazon/ion/streaming/ReaderTest.java
rename to test/software/amazon/ion/streaming/ReaderTest.java
index 50ba1ab6d5..f88ca8bfb8 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/software/amazon/ion/streaming/ReaderTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
-
-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;
+package software.amazon.ion.streaming;
+
+import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
+import static software.amazon.ion.junit.IonAssert.checkNullSymbol;
+
+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;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/streaming/ReaderTestCase.java b/test/software/amazon/ion/streaming/ReaderTestCase.java
similarity index 87%
rename from test/com/amazon/ion/streaming/ReaderTestCase.java
rename to test/software/amazon/ion/streaming/ReaderTestCase.java
index c39208d8b0..82b3f8a72a 100644
--- a/test/com/amazon/ion/streaming/ReaderTestCase.java
+++ b/test/software/amazon/ion/streaming/ReaderTestCase.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.streaming;
+
+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;
 import java.io.IOException;
 import org.junit.After;
 
diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/test/software/amazon/ion/streaming/RoundTripStreamingTest.java
similarity index 93%
rename from test/com/amazon/ion/streaming/RoundTripStreamingTest.java
rename to test/software/amazon/ion/streaming/RoundTripStreamingTest.java
index f1eb07e002..6f4affb49c 100644
--- a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
+++ b/test/software/amazon/ion/streaming/RoundTripStreamingTest.java
@@ -13,28 +13,28 @@
  * permissions and limitations under the License.
  */
 
-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;
+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._Private_Utils.utf8;
+import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
+
+import software.amazon.ion.IonBinaryWriter;
+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._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
+import software.amazon.ion.system.IonTextWriterBuilder;
+import software.amazon.ion.util.Equivalence;
+import software.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/test/software/amazon/ion/streaming/SeekableReaderTest.java
similarity index 94%
rename from test/com/amazon/ion/streaming/SeekableReaderTest.java
rename to test/software/amazon/ion/streaming/SeekableReaderTest.java
index cc6ce61cda..191d4e0d02 100644
--- a/test/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/software/amazon/ion/streaming/SeekableReaderTest.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.streaming;
+
+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._Private_Utils;
+import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Assert;
diff --git a/test/com/amazon/ion/streaming/SpanReaderTest.java b/test/software/amazon/ion/streaming/SpanReaderTest.java
similarity index 94%
rename from test/com/amazon/ion/streaming/SpanReaderTest.java
rename to test/software/amazon/ion/streaming/SpanReaderTest.java
index 646906caca..28d7047d98 100644
--- a/test/com/amazon/ion/streaming/SpanReaderTest.java
+++ b/test/software/amazon/ion/streaming/SpanReaderTest.java
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.streaming;
+
+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;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/streaming/SpanTests.java b/test/software/amazon/ion/streaming/SpanTests.java
similarity index 92%
rename from test/com/amazon/ion/streaming/SpanTests.java
rename to test/software/amazon/ion/streaming/SpanTests.java
index 54d23fcdde..1ae50720b7 100644
--- a/test/com/amazon/ion/streaming/SpanTests.java
+++ b/test/software/amazon/ion/streaming/SpanTests.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import com.amazon.ion.util.SpansTest;
+import software.amazon.ion.util.SpansTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/test/com/amazon/ion/streaming/TextSpanTest.java b/test/software/amazon/ion/streaming/TextSpanTest.java
similarity index 80%
rename from test/com/amazon/ion/streaming/TextSpanTest.java
rename to test/software/amazon/ion/streaming/TextSpanTest.java
index cd8c5a340e..af3e727021 100644
--- a/test/com/amazon/ion/streaming/TextSpanTest.java
+++ b/test/software/amazon/ion/streaming/TextSpanTest.java
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.streaming;
+package software.amazon.ion.streaming;
 
-import static com.amazon.ion.ReaderMaker.valuesExcluding;
-import static com.amazon.ion.util.Spans.currentSpan;
+import static software.amazon.ion.ReaderMaker.valuesExcluding;
+import static software.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 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;
 import org.junit.Test;
 
 /**
diff --git a/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java b/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
similarity index 96%
rename from test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
rename to test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
index 410ac4509e..2c52949c28 100644
--- a/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
+++ b/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.system;
+package software.amazon.ion.system;
 
-import static com.amazon.ion.TestUtils.symbolTableEquals;
+import static software.amazon.ion.TestUtils.symbolTableEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -23,14 +23,14 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-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 software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.impl.Symtabs;
+import software.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import software.amazon.ion.impl._Private_IonWriter;
+import software.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/test/software/amazon/ion/system/IonReaderBuilderTest.java
similarity index 93%
rename from test/com/amazon/ion/system/IonReaderBuilderTest.java
rename to test/software/amazon/ion/system/IonReaderBuilderTest.java
index 6b15bb458b..32adf50b12 100644
--- a/test/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/software/amazon/ion/system/IonReaderBuilderTest.java
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.system;
+package software.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 software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import org.junit.Rule;
diff --git a/test/com/amazon/ion/system/IonSystemBuilderTest.java b/test/software/amazon/ion/system/IonSystemBuilderTest.java
similarity index 94%
rename from test/com/amazon/ion/system/IonSystemBuilderTest.java
rename to test/software/amazon/ion/system/IonSystemBuilderTest.java
index ad3f40b0fb..995a91dd74 100644
--- a/test/com/amazon/ion/system/IonSystemBuilderTest.java
+++ b/test/software/amazon/ion/system/IonSystemBuilderTest.java
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.system;
+package software.amazon.ion.system;
 
-import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.isLiteSystem;
+import static software.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 com.amazon.ion.IonCatalog;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.impl._Private_IonWriter;
+import software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.impl._Private_IonWriter;
 import java.io.ByteArrayOutputStream;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/system/IonTextWriterBuilderTest.java b/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
similarity index 93%
rename from test/com/amazon/ion/system/IonTextWriterBuilderTest.java
rename to test/software/amazon/ion/system/IonTextWriterBuilderTest.java
index 5c819debdf..d3665d781e 100644
--- a/test/com/amazon/ion/system/IonTextWriterBuilderTest.java
+++ b/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
@@ -13,27 +13,27 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.system;
+
+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 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 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 software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.impl.Symtabs;
+import software.amazon.ion.impl._Private_IonWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
diff --git a/test/com/amazon/ion/system/SimpleCatalogTest.java b/test/software/amazon/ion/system/SimpleCatalogTest.java
similarity index 94%
rename from test/com/amazon/ion/system/SimpleCatalogTest.java
rename to test/software/amazon/ion/system/SimpleCatalogTest.java
index 251dce0001..e8e79fcc27 100644
--- a/test/com/amazon/ion/system/SimpleCatalogTest.java
+++ b/test/software/amazon/ion/system/SimpleCatalogTest.java
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-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;
+package software.amazon.ion.system;
+
+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 java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/test/software/amazon/ion/util/EquivalenceTest.java
similarity index 98%
rename from test/com/amazon/ion/util/EquivalenceTest.java
rename to test/software/amazon/ion/util/EquivalenceTest.java
index 8a552ec1dc..2e516f5fb7 100644
--- a/test/com/amazon/ion/util/EquivalenceTest.java
+++ b/test/software/amazon/ion/util/EquivalenceTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.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;
+import software.amazon.ion.IonFloat;
+import software.amazon.ion.IonList;
+import software.amazon.ion.IonStruct;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonValue;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/util/IonStreamUtilsTest.java b/test/software/amazon/ion/util/IonStreamUtilsTest.java
similarity index 90%
rename from test/com/amazon/ion/util/IonStreamUtilsTest.java
rename to test/software/amazon/ion/util/IonStreamUtilsTest.java
index f95f8a6545..b88462106f 100644
--- a/test/com/amazon/ion/util/IonStreamUtilsTest.java
+++ b/test/software/amazon/ion/util/IonStreamUtilsTest.java
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.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 software.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static software.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static software.amazon.ion.util.IonStreamUtils.isIonBinary;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/test/com/amazon/ion/util/JarInfoTest.java b/test/software/amazon/ion/util/JarInfoTest.java
similarity index 96%
rename from test/com/amazon/ion/util/JarInfoTest.java
rename to test/software/amazon/ion/util/JarInfoTest.java
index 3994ed4e15..6b4964919c 100644
--- a/test/com/amazon/ion/util/JarInfoTest.java
+++ b/test/software/amazon/ion/util/JarInfoTest.java
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
-import com.amazon.ion.IonException;
-import com.amazon.ion.Timestamp;
+import software.amazon.ion.IonException;
+import software.amazon.ion.Timestamp;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/test/com/amazon/ion/util/NullOutputStream.java b/test/software/amazon/ion/util/NullOutputStream.java
similarity index 96%
rename from test/com/amazon/ion/util/NullOutputStream.java
rename to test/software/amazon/ion/util/NullOutputStream.java
index 584531905c..cb1624f129 100644
--- a/test/com/amazon/ion/util/NullOutputStream.java
+++ b/test/software/amazon/ion/util/NullOutputStream.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/com/amazon/ion/util/PrinterTest.java b/test/software/amazon/ion/util/PrinterTest.java
similarity index 95%
rename from test/com/amazon/ion/util/PrinterTest.java
rename to test/software/amazon/ion/util/PrinterTest.java
index fc26658003..2aa59f6d43 100644
--- a/test/com/amazon/ion/util/PrinterTest.java
+++ b/test/software/amazon/ion/util/PrinterTest.java
@@ -13,32 +13,32 @@
  * 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;
+package software.amazon.ion.util;
+
+
+import static software.amazon.ion.SystemSymbols.ION_1_0;
+import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+
+import software.amazon.ion.BlobTest;
+import software.amazon.ion.ClobTest;
+import software.amazon.ion.IntTest;
+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.IonTestCase;
+import software.amazon.ion.IonTimestamp;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.impl._Private_Utils;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/util/RepeatInputStream.java b/test/software/amazon/ion/util/RepeatInputStream.java
similarity index 98%
rename from test/com/amazon/ion/util/RepeatInputStream.java
rename to test/software/amazon/ion/util/RepeatInputStream.java
index c9e254af42..6de05853f2 100644
--- a/test/com/amazon/ion/util/RepeatInputStream.java
+++ b/test/software/amazon/ion/util/RepeatInputStream.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/util/SpansTest.java b/test/software/amazon/ion/util/SpansTest.java
similarity index 87%
rename from test/com/amazon/ion/util/SpansTest.java
rename to test/software/amazon/ion/util/SpansTest.java
index 33355caa4f..e263504a6e 100644
--- a/test/com/amazon/ion/util/SpansTest.java
+++ b/test/software/amazon/ion/util/SpansTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.amazon.ion.util;
 
-import static com.amazon.ion.util.Spans.currentSpan;
+import static software.amazon.ion.util.Spans.currentSpan;
 import static org.junit.Assert.assertNull;
 
-import com.amazon.ion.Span;
-import com.amazon.ion.TextSpan;
+import software.amazon.ion.Span;
+import software.amazon.ion.TextSpan;
 import org.junit.Test;
 
 public class SpansTest
diff --git a/test/com/amazon/ion/util/TextTest.java b/test/software/amazon/ion/util/TextTest.java
similarity index 96%
rename from test/com/amazon/ion/util/TextTest.java
rename to test/software/amazon/ion/util/TextTest.java
index 6011adfd7c..5fe866728b 100644
--- a/test/com/amazon/ion/util/TextTest.java
+++ b/test/software/amazon/ion/util/TextTest.java
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.ion.util;
+package software.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 software.amazon.ion.BlobTest;
+import software.amazon.ion.BlobTest.TestData;
+import software.amazon.ion.Decimal;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.impl._Private_IonTextAppender;
 import java.math.BigDecimal;
 import org.junit.Test;