diff --git a/.github/actions/inspect-version/action.yml b/.github/actions/inspect-version/action.yml index dd34cd7d8b..77e3f53370 100644 --- a/.github/actions/inspect-version/action.yml +++ b/.github/actions/inspect-version/action.yml @@ -27,7 +27,7 @@ description: > GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }} with: project_version: $\{{ env.PROJECT_VERSION }} - repo: amzn/ion-java + repo: amazon-ion/ion-java fail_if_invalid: true ``` diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml index 277ccff505..ae6e3b668b 100644 --- a/.github/workflows/ion-java-performance-regression-detector.yml +++ b/.github/workflows/ion-java-performance-regression-detector.yml @@ -29,7 +29,7 @@ jobs: - name: Checkout ion-java-benchmark-cli uses: actions/checkout@v2 with: - repository: amzn/ion-java-benchmark-cli + repository: amazon-ion/ion-java-benchmark-cli ref: master path: ion-java-benchmark-cli @@ -72,7 +72,7 @@ jobs: - name: Checkout the current commit uses: actions/checkout@v2 with: - repository: amzn/ion-java + repository: amazon-ion/ion-java ref: master path: ion-java diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml index e39846aed3..c7b166b8e0 100644 --- a/.github/workflows/ion-test-driver.yml +++ b/.github/workflows/ion-test-driver.yml @@ -9,14 +9,14 @@ jobs: - name: Checkout ion-java uses: actions/checkout@master with: - repository: amzn/ion-java + repository: amazon-ion/ion-java ref: master path: ion-java - name: Checkout ion-test-driver uses: actions/checkout@master with: - repository: amzn/ion-test-driver + repository: amazon-ion/ion-test-driver ref: master path: ion-test-driver @@ -36,7 +36,7 @@ jobs: - name: Run ion-test-driver run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }} - --replace ion-java,https://github.com/amzn/ion-java.git,$main + --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main - name: Upload result uses: actions/upload-artifact@v2 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a6613b2a1..e0bbcde442 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: # Ensures that the version is not a release (i.e. -SNAPSHOT) or if it is a release version, # ensures that the version is a later version number than the existing releases. # See limitations at: - # https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml + # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -49,6 +49,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - repo: amzn/ion-java + repo: amazon-ion/ion-java project_version: ${{ env.PROJECT_VERSION }} fail_if_invalid: true diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index a98b44604f..beff803d54 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -4,10 +4,10 @@ # # If the project/library version is not a snapshot version, and it is greater than the # latest release in GitHub, then it creates a draft PR for the new library version. -# This workflow always compares against the releases in amzn/ion-java, but will create +# This workflow always compares against the releases in amazon-ion/ion-java, but will create # a draft release in a forked repository if the workflow is triggered in a fork. # See limitations at: -# https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml +# https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml # # This workflow is almost a reusable workflow that can be used by any of our repos that # use semantic versioned releases. In order to make it reusable, we need to move it to @@ -16,7 +16,7 @@ # pass in the library version as a workflow argument, or it will need to have the # `project.version` file. Also, there are some references to the 'master' branch that # will need to be factored out (since some of our repos use 'main' as the default branch). -# Finally, there are references to "amzn/ion-java" should come from an input variable +# Finally, there are references to "amazon-ion/ion-java" should come from an input variable # or be retrieved from the GitHub Actions context. # See https://docs.github.com/en/actions/using-workflows/reusing-workflows # @@ -52,7 +52,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - repo: amzn/ion-java + repo: amazon-ion/ion-java project_version: ${{ env.PROJECT_VERSION }} - run: | echo "Result: ${{ toJSON(steps.inspect.outputs) }}" diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml index 0191fdc6b6..e7d5bf4bcf 100644 --- a/.github/workflows/test-inspect-version-action.yml +++ b/.github/workflows/test-inspect-version-action.yml @@ -60,7 +60,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - repo: amzn/ion-java + repo: amazon-ion/ion-java project_version: ${{ matrix.version }} fail_if_invalid: ${{ matrix.fail_if_invalid }} diff --git a/.gitmodules b/.gitmodules index 38171e6698..23a0a7946d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ion-tests"] path = ion-tests - url = https://github.com/amzn/ion-tests.git + url = https://github.com/amazon-ion/ion-tests.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f226f24d2d..b81cdc1215 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution. We welcome you to use the GitHub issue tracker to report bugs or suggest features. -When filing an issue, please check [existing open](https://github.com/amzn/ion-java/issues), or [recently closed](https://github.com/amzn/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already +When filing an issue, please check [existing open](https://github.com/amazon-ion/ion-java/issues), or [recently closed](https://github.com/amazon-ion/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already reported the issue. Please try to include as much information as you can. Details like these are incredibly useful: * A reproducible test case or series of steps @@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu ## Finding contributions to work on -Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amzn/ion-java/labels/help%20wanted) issues is a great place to start. +Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amazon-ion/ion-java/labels/help%20wanted) issues is a great place to start. ## Code of Conduct @@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](https://github.com/amzn/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](https://github.com/amazon-ion/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. \ No newline at end of file diff --git a/README.md b/README.md index 8f19b1c470..23038b4814 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Amazon Ion Java -A Java implementation of the [Ion data notation](http://amzn.github.io/ion-docs). +A Java implementation of the [Ion data notation](https://amazon-ion.github.io/ion-docs). -[![Build Status](https://travis-ci.org/amzn/ion-java.svg?branch=master)](https://travis-ci.org/amzn/ion-java) +[![Build Status](https://travis-ci.org/amazon-ion/ion-java.svg?branch=master)](https://travis-ci.org/amazon-ion/ion-java) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java) [![Javadoc](https://javadoc-badge.appspot.com/com.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/com.amazon.ion/ion-java) @@ -13,7 +13,7 @@ The easiest way to clone the `ion-java` repository and initialize its `ion-tests submodule is to run the following command. ``` -$ git clone --recursive https://github.com/amzn/ion-java.git ion-java +$ git clone --recursive https://github.com/amazon-ion/ion-java.git ion-java ``` Alternatively, the submodule may be initialized independently from the clone diff --git a/build.gradle.kts b/build.gradle.kts index dbb6456154..f0ae76c691 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,7 +72,7 @@ tasks { /** * This task creates a properties file that will be included in the compiled jar. It contains information about - * the build/version of the library used in [com.amazon.ion.util.JarInfo]. See https://github.com/amzn/ion-java/pull/433 + * the build/version of the library used in [com.amazon.ion.util.JarInfo]. See https://github.com/amazon-ion/ion-java/pull/433 * for why this is done with a properties file rather than the Jar manifest. */ val generateJarInfo by creating { @@ -124,7 +124,7 @@ publishing { pom { name.set("Ion Java") description.set(project.description) - url.set("https://github.com/amzn/ion-java/") + url.set("https://github.com/amazon-ion/ion-java/") licenses { license { @@ -141,9 +141,9 @@ publishing { } } scm { - connection.set("scm:git:git@github.com:amzn/ion-java.git") - developerConnection.set("scm:git:git@github.com:amzn/ion-java.git") - url.set("git@github.com:amzn/ion-java.git") + connection.set("scm:git:git@github.com:amazon-ion/ion-java.git") + developerConnection.set("scm:git:git@github.com:amazon-ion/ion-java.git") + url.set("git@github.com:amazon-ion/ion-java.git") } } } diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md index 1d7006d05a..6507f1ee1f 100644 --- a/ion-java-cli/README.md +++ b/ion-java-cli/README.md @@ -1,5 +1,5 @@ # Amazon Ion Java CLI -A Java implementation of CLI where its design document is located in [here](https://github.com/amzn/ion-test-driver#design). +A Java implementation of CLI where its design document is located in [here](https://github.com/amazon-ion/ion-test-driver#design). The package is stored under `ion-java/ion-java-cli`. diff --git a/src/com/amazon/ion/IonCatalog.java b/src/com/amazon/ion/IonCatalog.java index cf79390d92..943a4c33ac 100644 --- a/src/com/amazon/ion/IonCatalog.java +++ b/src/com/amazon/ion/IonCatalog.java @@ -72,7 +72,7 @@ * Binary decoding prefers an exact match, and in a couple edge cases, * requires it. Therefore a single "get latest version" method is insufficient. * See the - * Ion Symbols page + * Ion Symbols page * for more details on this topic. *

* It's expected that many if not most applications will implement a dynamic diff --git a/src/com/amazon/ion/IonDatagram.java b/src/com/amazon/ion/IonDatagram.java index 72394b35d3..bbb442124d 100644 --- a/src/com/amazon/ion/IonDatagram.java +++ b/src/com/amazon/ion/IonDatagram.java @@ -42,11 +42,11 @@ public interface IonDatagram /** * This inherited method is not yet supported by datagrams. *

- * Vote for issue amzn/ion-java/issues/48 if you need this. + * Vote for issue amazon-ion/ion-java/issues/48 if you need this. * * @throws UnsupportedOperationException at every call. * - * @see amzn/ion-java/issues/48 + * @see amazon-ion/ion-java/issues/48 */ public void add(int index, IonValue element) throws ContainedValueException, NullPointerException; @@ -54,11 +54,11 @@ public void add(int index, IonValue element) /** * This inherited method is not yet supported by datagrams. *

- * Vote for issue amzn/ion-java/issues/48 if you need this. + * Vote for issue amazon-ion/ion-java/issues/48 if you need this. * * @throws UnsupportedOperationException at every call. * - * @see amzn/ion-java/issues/48 + * @see amazon-ion/ion-java/issues/48 */ public ValueFactory add(int index) throws ContainedValueException, NullPointerException; @@ -66,22 +66,22 @@ public ValueFactory add(int index) /** * This inherited method is not yet supported by datagrams. *

- * Vote for issue amzn/ion-java/issues/47 if you need this. + * Vote for issue amazon-ion/ion-java/issues/47 if you need this. * * @throws UnsupportedOperationException at every call. * - * @see amzn/ion-java/issues/47 + * @see amazon-ion/ion-java/issues/47 */ public boolean addAll(int index, Collection c); /** * This inherited method is not yet supported by datagrams. *

- * Vote for issue amzn/ion-java/issues/50 if you need this. + * Vote for issue amazon-ion/ion-java/issues/50 if you need this. * * @throws UnsupportedOperationException at every call. * - * @see amzn/ion-java/issues/50 + * @see amazon-ion/ion-java/issues/50 */ public IonValue set(int index, IonValue element); diff --git a/src/com/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java index 9066c47326..f8e678737a 100644 --- a/src/com/amazon/ion/IonReader.java +++ b/src/com/amazon/ion/IonReader.java @@ -41,7 +41,7 @@ * WARNING: This interface should not be implemented or extended by * code outside of this library. * We still have some work to do before this interface is stable. - * See issue amzn/ion-java/issues/11 + * See issue amazon-ion/ion-java/issues/11 *

* An {@code IonReader} has a "cursor" tracking the current value on * which the reader is positioned. Generally, newly created readers are not @@ -88,7 +88,7 @@ *

The {@link SeekableReader} Facet

* This facet is available on all readers except those created from * an {@link java.io.InputStream InputStream}. - * (See issue amzn/ion-java/issues/17.) + * (See issue amazon-ion/ion-java/issues/17.) * It allows the user to reposition the reader to a {@link Span} over the * same reader instance or another reader with the same source. * diff --git a/src/com/amazon/ion/IonSystem.java b/src/com/amazon/ion/IonSystem.java index 8dd489562a..aa1b4b93f5 100644 --- a/src/com/amazon/ion/IonSystem.java +++ b/src/com/amazon/ion/IonSystem.java @@ -94,7 +94,7 @@ public SymbolTable getSystemSymbolTable(String ionVersionId) * or if any but the first is a system table. * @throws NullPointerException if any import is null. */ - // TODO amzn/ion-java/issues/38 Should we allow substituted imports as valid args? + // TODO amazon-ion/ion-java/issues/38 Should we allow substituted imports as valid args? public SymbolTable newLocalSymbolTable(SymbolTable... imports); diff --git a/src/com/amazon/ion/IonTimestamp.java b/src/com/amazon/ion/IonTimestamp.java index 63bb78c5bc..04c2006f71 100644 --- a/src/com/amazon/ion/IonTimestamp.java +++ b/src/com/amazon/ion/IonTimestamp.java @@ -29,7 +29,7 @@ public interface IonTimestamp extends IonValue { - // TODO amzn/ion-java/issues/223 Deprecate setters and getters + // TODO amazon-ion/ion-java/issues/223 Deprecate setters and getters /** * Gets the value of this timestamp in a form suitable for diff --git a/src/com/amazon/ion/SubstituteSymbolTableException.java b/src/com/amazon/ion/SubstituteSymbolTableException.java index 7472ec8657..9f291f3858 100644 --- a/src/com/amazon/ion/SubstituteSymbolTableException.java +++ b/src/com/amazon/ion/SubstituteSymbolTableException.java @@ -21,7 +21,7 @@ * * @see SymbolTable#isSubstitute() */ -// TODO amzn/ion-java/issues/40 Provide some useful info to assist callers with handling this +// TODO amazon-ion/ion-java/issues/40 Provide some useful info to assist callers with handling this // exception. E.g. reference to the substitute import in violation. public class SubstituteSymbolTableException extends IonException diff --git a/src/com/amazon/ion/SymbolTable.java b/src/com/amazon/ion/SymbolTable.java index e73e1da738..2a7d2a0b55 100644 --- a/src/com/amazon/ion/SymbolTable.java +++ b/src/com/amazon/ion/SymbolTable.java @@ -43,7 +43,7 @@ * Implementations of this interface are safe for use by multiple * threads. * - * @see Ion Symbols page + * @see Ion Symbols page */ public interface SymbolTable { diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java index 0480090eae..6c8955a8a5 100644 --- a/src/com/amazon/ion/Timestamp.java +++ b/src/com/amazon/ion/Timestamp.java @@ -932,7 +932,7 @@ private static IllegalArgumentException fail(CharSequence input) * @return * {@code null} if the {@code CharSequence} is "null.timestamp" * - * @see Ion Timestamp Page + * @see Ion Timestamp Page * @see W3C Note on Date and Time Formats */ public static Timestamp valueOf(CharSequence ionFormattedTimestamp) diff --git a/src/com/amazon/ion/impl/ImportLocation.java b/src/com/amazon/ion/impl/ImportLocation.java index acd5873887..0fa859e9a9 100644 --- a/src/com/amazon/ion/impl/ImportLocation.java +++ b/src/com/amazon/ion/impl/ImportLocation.java @@ -5,7 +5,7 @@ * in a shared symbol table. * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See - * https://github.com/amzn/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance + * https://github.com/amazon-ion/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance * degradation if ImportLocation support were added after initial release of the incremental IonReader. */ class ImportLocation { diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/com/amazon/ion/impl/IonBinary.java index 956d49212c..a846239c51 100644 --- a/src/com/amazon/ion/impl/IonBinary.java +++ b/src/com/amazon/ion/impl/IonBinary.java @@ -800,7 +800,7 @@ public static int lenAnnotationListWithLen(String[] annotations, // add up the length of the encoded symbols for (int ii=0; ii 0; // TODO amzn/ion-java/issues/12 + assert symid > 0; // TODO amazon-ion/ion-java/issues/12 annotationLen += IonBinary.lenVarUInt(symid); } diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java index a1585d6ed5..e1304035be 100644 --- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java +++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java @@ -546,7 +546,7 @@ else if (tid == _Private_IonConstants.tidStruct) { // the value BEFORE a *Value() method is even called. Once that is fixed, // _value_start can be removed, and _input._pos can be used to find the // start of the value at the current valid position. - // amzn/ion-java/issues/88 tracks the fix for bringing IVM handling up to + // amazon-ion/ion-java/issues/88 tracks the fix for bringing IVM handling up to // spec. _value_start = start_of_value; _position_len = len + (start_of_value - start_of_tid); @@ -968,7 +968,7 @@ private int readVarInt(int firstByte) throws IOException { // into a Java int. // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int // - // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields + // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields long retValue = 0; int b = firstByte; @@ -1003,7 +1003,7 @@ private int readVarInt(int firstByte) throws IOException { retValue = (retValue << 7) | (b & 0x7F); if ((b & 0x80) != 0) break; - // Don't support anything above a 5-byte VarInt for now, see https://github.com/amzn/ion-java/issues/146 + // Don't support anything above a 5-byte VarInt for now, see https://github.com/amazon-ion/ion-java/issues/146 throwVarIntOverflowException(5); } @@ -1036,7 +1036,7 @@ protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException // into a Java int. // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int // - // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields + // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields long retvalue = 0; int b; @@ -1071,7 +1071,7 @@ protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException retvalue = (retvalue << 7) | (b & 0x7F); if ((b & 0x80) != 0) break; - // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amzn/ion-java/issues/146 + // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amazon-ion/ion-java/issues/146 throwVarIntOverflowException(7); } diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java index b18c819b2b..f0f73723af 100644 --- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java +++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java @@ -50,7 +50,7 @@ class IonReaderBinarySystemX { super(); init_raw(in); - // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24 + // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24 _symbols = SharedSymbolTable.getSystemSymbolTable(1); } diff --git a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java index 31d3d775be..a9ea04080f 100644 --- a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java +++ b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java @@ -97,7 +97,7 @@ public IonReaderBinaryUserX(IonCatalog catalog, //FIXME: PERF_TEST was :private final void init_user(IonCatalog catalog) { - // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24 + // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24 _symbols = SharedSymbolTable.getSystemSymbolTable(1); _catalog = catalog; } @@ -343,7 +343,7 @@ public T asFacet(Class facetType) return facetType.cast(new SpanProviderFacet()); } - // TODO amzn/ion-java/issues/17 support seeking over InputStream + // TODO amazon-ion/ion-java/issues/17 support seeking over InputStream if (_input instanceof FromByteArray) { if (facetType == SeekableReader.class) @@ -362,7 +362,7 @@ public T asFacet(Class facetType) // of the facet depends upon the current state of this subject, // and that can change over time. - // TODO amzn/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle + // TODO amazon-ion/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle // field names and annotations. // Ensure there's a contiguous buffer we can copy. @@ -431,7 +431,7 @@ public void transferCurrentValue(_Private_ByteTransferSink sink) throw new UnsupportedOperationException(); } - // TODO amzn/ion-java/issues/16 wrong if current value has a field name or + // TODO amazon-ion/ion-java/issues/16 wrong if current value has a field name or // annotations since the position is in the wrong place. // TODO when implementing that, be careful to handle the case where // the writer already holds a pending field name or annotations! diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java index 7729340369..4bfb34b31a 100644 --- a/src/com/amazon/ion/impl/IonReaderTextRawX.java +++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java @@ -50,7 +50,7 @@ * * This reader scan skip values and in doing so it does not * materialize the contents and it does not validate the contents. - * TODO amzn/ion-java/issues/7 We may want to make validation on skip optional. + * TODO amazon-ion/ion-java/issues/7 We may want to make validation on skip optional. * * This manages the value buffer (_v ValueVariant) and the lob * content (_lob_*) which is cached in some cases. It's main diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java index 62b743a7b2..661fbd5c19 100644 --- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java +++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java @@ -64,7 +64,7 @@ class IonReaderTextSystemX protected IonReaderTextSystemX(UnifiedInputStreamX iis) { - _system_symtab = _Private_Utils.systemSymtab(1); // TODO check IVM to determine version: amzn/ion-java/issues/19 + _system_symtab = _Private_Utils.systemSymtab(1); // TODO check IVM to determine version: amazon-ion/ion-java/issues/19 init_once(); init(iis, IonType.DATAGRAM); } diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java index d94cce0d6a..95b5299750 100644 --- a/src/com/amazon/ion/impl/IonTypeID.java +++ b/src/com/amazon/ion/impl/IonTypeID.java @@ -23,7 +23,7 @@ final class IonTypeID { // does not have a type ID, so we will use it to mean 'annotation wrapper' instead. static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM; - // Lookup table from type ID to IonType. See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats + // Lookup table from type ID to IonType. See https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats static final IonType[] ION_TYPES = new IonType[] { IonType.NULL, IonType.BOOL, diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/com/amazon/ion/impl/IonWriterSystem.java index 02890c0a85..be0c5d245e 100644 --- a/src/com/amazon/ion/impl/IonWriterSystem.java +++ b/src/com/amazon/ion/impl/IonWriterSystem.java @@ -139,20 +139,20 @@ boolean shouldWriteIvm() } if (_initial_ivm_handling == InitialIvmHandling.SUPPRESS) { - // TODO amzn/ion-java/issues/24 Must write IVM if given system != 1.0 + // TODO amazon-ion/ion-java/issues/24 Must write IVM if given system != 1.0 return false; } - // TODO amzn/ion-java/issues/24 Add SUPPRESS_ALL to suppress non 1.0 IVMs + // TODO amazon-ion/ion-java/issues/24 Add SUPPRESS_ALL to suppress non 1.0 IVMs if (_ivm_minimizing == IvmMinimizing.ADJACENT) { - // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system + // TODO amazon-ion/ion-java/issues/24 Write IVM if current system version != given system // For now we assume that it's the same since we only support 1.0 return ! _previous_value_was_ivm; } if (_ivm_minimizing == IvmMinimizing.DISTANT) { - // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system + // TODO amazon-ion/ion-java/issues/24 Write IVM if current system version != given system // For now we assume that it's the same since we only support 1.0 return ! _anything_written; } @@ -291,7 +291,7 @@ final void writeSymbol(int symbolId) throws IOException && getDepth() == 0 && _annotation_count == 0) { // $ion_1_0 is written as an IVM only if it is not annotated - // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ. + // TODO amazon-ion/ion-java/issues/24 Make sure to get the right symtab, default may differ. writeIonVersionMarker(); } else @@ -306,7 +306,7 @@ public final void writeSymbol(String value) throws IOException && getDepth() == 0 && _annotation_count == 0) { // $ion_1_0 is written as an IVM only if it is not annotated - // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ. + // TODO amazon-ion/ion-java/issues/24 Make sure to get the right symtab, default may differ. writeIonVersionMarker(); } else { diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java index 4c7b2c2192..8e1ea9b4a9 100644 --- a/src/com/amazon/ion/impl/IonWriterSystemText.java +++ b/src/com/amazon/ion/impl/IonWriterSystemText.java @@ -660,7 +660,7 @@ public void writeString(String value) && ! _following_long_string && _long_string_threshold < value.length()) { - // TODO amzn/ion-java/issues/57 This can lead to mixed newlines in the output. + // TODO amazon-ion/ion-java/issues/57 This can lead to mixed newlines in the output. // It assumes NL line separators, but _options could use CR+NL _output.printLongString(value); diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/com/amazon/ion/impl/IonWriterUserBinary.java index ae1c072f3b..7db4c8fcc2 100644 --- a/src/com/amazon/ion/impl/IonWriterUserBinary.java +++ b/src/com/amazon/ion/impl/IonWriterUserBinary.java @@ -97,7 +97,7 @@ public void writeValue(IonReader reader) mySymtabExtendsCache.symtabsCompat(getSymbolTable(), reader.getSymbolTable()))) { - // TODO amzn/ion-java/issues/16 Doesn't copy annotations or field names. + // TODO amazon-ion/ion-java/issues/16 Doesn't copy annotations or field names. transfer.transferCurrentValue(myCopySink); return; } diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java index b5990d5cce..56198844c1 100644 --- a/src/com/amazon/ion/impl/LocalSymbolTable.java +++ b/src/com/amazon/ion/impl/LocalSymbolTable.java @@ -257,7 +257,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader, sid = getSidForSymbolTableField(fieldName); } - // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case + // TODO amazon-ion/ion-java/issues/36 Switching over SIDs doesn't cover the case // where the relevant field names are defined by a prev LST; // the prev LST could have 'symbols' defined locally with a // different SID! @@ -839,7 +839,7 @@ boolean symtabExtends(SymbolTable other) // Superset must have same/more known symbols than subset. if (getMaxId() < subset.getMaxId()) return false; - // TODO amzn/ion-java/issues/18 Currently, we check imports by their refs. which + // TODO amazon-ion/ion-java/issues/18 Currently, we check imports by their refs. which // might be overly strict; imports which are not the same ref. // but have the same semantic states fails the extension check. if (! myImportsList.equalImports(subset.myImportsList)) diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/com/amazon/ion/impl/LocalSymbolTableImports.java index b4b7b5e131..eb03bf0af9 100644 --- a/src/com/amazon/ion/impl/LocalSymbolTableImports.java +++ b/src/com/amazon/ion/impl/LocalSymbolTableImports.java @@ -29,7 +29,7 @@ *

* This class is immutable, and hence safe for use by multiple threads. */ -// TODO amzn/ion-java/issues/37 Create specialized class to handle the common case where +// TODO amazon-ion/ion-java/issues/37 Create specialized class to handle the common case where // there are zero or one imported non-system shared symtab(s). final class LocalSymbolTableImports { diff --git a/src/com/amazon/ion/impl/SharedSymbolTable.java b/src/com/amazon/ion/impl/SharedSymbolTable.java index dedb85985f..02051143a5 100644 --- a/src/com/amazon/ion/impl/SharedSymbolTable.java +++ b/src/com/amazon/ion/impl/SharedSymbolTable.java @@ -69,7 +69,7 @@ final class SharedSymbolTable /** * The singleton instance of Ion 1.0 system symbol table. *

- * TODO amzn/ion-java/issues/34 Optimize system symtabs by using our custom backing impl. + * TODO amazon-ion/ion-java/issues/34 Optimize system symtabs by using our custom backing impl. */ private static final SymbolTable ION_1_0_SYSTEM_SYMTAB; static @@ -238,9 +238,9 @@ static SymbolTable newSharedSymbolTable(IonReader reader, sid = getSidForSymbolTableField(fieldName); } - // TODO amzn/ion-java/issues/35 If there's more than one 'symbols' or 'imports' + // TODO amazon-ion/ion-java/issues/35 If there's more than one 'symbols' or 'imports' // field, they will be merged together. - // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case + // TODO amazon-ion/ion-java/issues/36 Switching over SIDs doesn't cover the case // where the relevant field names are defined by a prev LST; // the prev LST could have 'symbols' defined locally with a // different SID! @@ -398,7 +398,7 @@ private static void putToMapIfNotThere(Map symbolsMap, while (symbols.hasNext()) { String text = symbols.next(); - // TODO amzn/ion-java/issues/12 What about empty symbols? + // TODO amazon-ion/ion-java/issues/12 What about empty symbols? if (symbolsMap.get(text) == null) { putToMapIfNotThere(symbolsMap, text, sid); diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/com/amazon/ion/impl/SymbolTokenImpl.java index b464e1aef0..1df8a9c6d3 100644 --- a/src/com/amazon/ion/impl/SymbolTokenImpl.java +++ b/src/com/amazon/ion/impl/SymbolTokenImpl.java @@ -65,7 +65,7 @@ public String toString() } /* - * TODO amzn/ion-java#126 + * TODO amazon-ion/ion-java#126 *Equals and hashCode must be symmetric. *Two symboltokens are only equal when text1 equals text2 (including null == null) *This is an incomplete solution, needs to be updated as symboltokens are fleshed out. diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java index 3465bd474d..85e4714fef 100644 --- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java +++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java @@ -40,7 +40,7 @@ public class _Private_IonBinaryWriterBuilder extends IonBinaryWriterBuilder { - // amzn/ion-java/issues/59 expose configuration points properly and figure out deprecation path for the old writer. + // amazon-ion/ion-java/issues/59 expose configuration points properly and figure out deprecation path for the old writer. private final _Private_IonManagedBinaryWriterBuilder myBinaryWriterBuilder; private ValueFactory mySymtabValueFactory; @@ -298,7 +298,7 @@ private _Private_IonBinaryWriterBuilder fillDefaults() */ private _Private_IonBinaryWriterBuilder fillLegacyDefaults() { - // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it + // amazon-ion/ion-java/issues/59 Fix this to use the new writer or eliminate it // Ensure that we don't modify the user's builder. _Private_IonBinaryWriterBuilder b = copy(); @@ -375,7 +375,7 @@ public final IonWriter build(OutputStream out) @Deprecated public final IonBinaryWriter buildLegacy() { - // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it + // amazon-ion/ion-java/issues/59 Fix this to use the new writer or eliminate it _Private_IonBinaryWriterBuilder b = fillLegacyDefaults(); IonWriterSystemBinary systemWriter = diff --git a/src/com/amazon/ion/impl/_Private_IonConstants.java b/src/com/amazon/ion/impl/_Private_IonConstants.java index 38b9b1ee97..156e8600e6 100644 --- a/src/com/amazon/ion/impl/_Private_IonConstants.java +++ b/src/com/amazon/ion/impl/_Private_IonConstants.java @@ -291,7 +291,7 @@ public static final int getLowNibble(int td) * * *

- * TODO amzn/ion-java/issues/23 However, there is still a potential failure if one of the + * TODO amazon-ion/ion-java/issues/23 However, there is still a potential failure if one of the * IonStruct's nested value has a field name with text * {@code " -- UNKNOWN SYMBOL TEXT -- $123"}, and that another nested value * of an IonStruct has a field name with unknown text and sid 123, these diff --git a/src/com/amazon/ion/impl/_Private_IonSystem.java b/src/com/amazon/ion/impl/_Private_IonSystem.java index d9024761f8..38fd3d81d0 100644 --- a/src/com/amazon/ion/impl/_Private_IonSystem.java +++ b/src/com/amazon/ion/impl/_Private_IonSystem.java @@ -36,12 +36,12 @@ public interface _Private_IonSystem public SymbolTable newSharedSymbolTable(IonStruct ionRep); /** - * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API. + * TODO Must correct amazon-ion/ion-java/issues/63 before exposing this or using from public API. */ public Iterator systemIterate(String ionText); /** - * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API. + * TODO Must correct amazon-ion/ion-java/issues/63 before exposing this or using from public API. */ public Iterator systemIterate(Reader ionText); diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java index 09fff660d7..be806aeb72 100644 --- a/src/com/amazon/ion/impl/_Private_Utils.java +++ b/src/com/amazon/ion/impl/_Private_Utils.java @@ -208,7 +208,7 @@ public static SymbolTokenImpl newSymbolToken(int sid) public static SymbolToken newSymbolToken(SymbolTable symtab, String text) { - // TODO amzn/ion-java/issues/21 symtab should not be null + // TODO amazon-ion/ion-java/issues/21 symtab should not be null text.getClass(); // quick null check SymbolToken tok = (symtab == null ? null : symtab.find(text)); @@ -227,7 +227,7 @@ public static SymbolToken newSymbolToken(SymbolTable symtab, { if (sid < 1) throw new IllegalArgumentException(); - // TODO amzn/ion-java/issues/21 symtab should not be null + // TODO amazon-ion/ion-java/issues/21 symtab should not be null String text = (symtab == null ? null : symtab.findKnownSymbol(sid)); return new SymbolTokenImpl(text, sid); } @@ -288,7 +288,7 @@ public static SymbolToken localize(SymbolTable symtab, String text = sym.getText(); int sid = sym.getSid(); - if (symtab != null) // TODO amzn/ion-java/issues/21 require symtab + if (symtab != null) // TODO amazon-ion/ion-java/issues/21 require symtab { if (text == null) { @@ -975,7 +975,7 @@ public static boolean symtabExtends(SymbolTable superset, SymbolTable subset) // If the subset's symtab is a system symtab, the superset's is always // an extension of the subset's as system symtab-ness is irrelevant to // the conditions for copy opt. to be safe. - // TODO amzn/ion-java/issues/24 System symtab-ness ARE relevant if there's multiple + // TODO amazon-ion/ion-java/issues/24 System symtab-ness ARE relevant if there's multiple // versions. if (subset.isSystemTable()) return true; diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java index 8bc415829a..2a1923afcf 100644 --- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java +++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java @@ -1360,7 +1360,7 @@ boolean isIVM(int sid) // When SID 2 occurs at the top level with no annotations, it has the // special properties of an IVM. Otherwise, it's considered a normal // symbol value. - // TODO amzn/ion-java/issues/88 requires this behavior to be changed, + // TODO amazon-ion/ion-java/issues/88 requires this behavior to be changed, // such that top-level SID 2 is treated as a symbol value, not an IVM. return depth == 0 && sid == ION_1_0_SID && !hasAnnotations(); } diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java index e0276329a7..1cc365311c 100644 --- a/src/com/amazon/ion/impl/lite/IonContainerLite.java +++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java @@ -78,7 +78,7 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull) // when name is null it could be a sid 0 so we need to perform the full symbol token lookup. // this is expensive so only do it when necessary // TODO profile `getKnownFieldNameSymbol` to see if we can improve its performance so branching - // is not necessary. https://github.com/amzn/ion-java/issues/140 + // is not necessary. https://github.com/amazon-ion/ion-java/issues/140 copy.setFieldNameSymbol(child.getKnownFieldNameSymbol()); } else { diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java index 9bb1a3d037..a9eebcd082 100644 --- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java +++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java @@ -417,7 +417,7 @@ public final void writeTo(IonWriter writer) // refer to slots in shared symbol table imports declared by the discarded table, an // error will be raised unnecessarily. To avoid that, only write an IVM when the writer's // symbol table is already the system symbol table. - // TODO evaluate whether an IVM should ever be written here. amzn/ion-java#200 + // TODO evaluate whether an IVM should ever be written here. amazon-ion/ion-java#200 try { writer.writeSymbol(SystemSymbols.ION_1_0); } catch (IOException ioe) { diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java index e8864163ba..e6884bd67d 100644 --- a/src/com/amazon/ion/impl/lite/IonStructLite.java +++ b/src/com/amazon/ion/impl/lite/IonStructLite.java @@ -44,7 +44,7 @@ final class IonStructLite { private static final int HASH_SIGNATURE = IonType.STRUCT.toString().hashCode(); - // TODO amzn/ion-java/issues/41: add support for _isOrdered + // TODO amazon-ion/ion-java/issues/41: add support for _isOrdered IonStructLite(ContainerlessContext context, boolean isNull) { diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java index 01bf587afb..fe9b9351e8 100644 --- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java +++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java @@ -65,11 +65,11 @@ final class IonSymbolLite if (text != null) { super.setValue(text); - // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore + // TODO [amazon-ion/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore } else { - // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table + // TODO [amazon-ion/ion-java/issues/223] - needs consistent handling, resolution against context symbol table _sid = sid; // there *is* an encoding present so we must update _isSymbolIdPresent(true); @@ -156,7 +156,7 @@ private int getSymbolId(SymbolTableProvider symbolTableProvider) assert(symtab != null); String name = _get_value(); - // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read) + // TODO [amazon-ion/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read) if (!symtab.isLocalTable()) { setSID(symtab.findSymbol(name)); @@ -262,7 +262,7 @@ else if (_stringValue() != null) } else { - // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table + // TODO [amazon-ion/ion-java/issues/223] - needs consistent handling, resolution against context symbol table // there is not text, so we can't clear the SID. allSymbolIDsCleared = false; } @@ -286,7 +286,7 @@ protected void setIsIonVersionMarker(boolean isIVM) final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider) throws IOException { - // TODO amzn/ion-java/issues/27 Fix symbol handling + // TODO amazon-ion/ion-java/issues/27 Fix symbol handling // A million-dollar question is - if text is missing, do // we throw (cannot serialize) or do we pass the sid thru??? diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java index 415bb3933a..2bc8cec3bd 100644 --- a/src/com/amazon/ion/impl/lite/IonSystemLite.java +++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java @@ -342,7 +342,7 @@ private IonValueLite load_value_helper(IonReader reader, boolean isTopLevel) v = newBool(reader.booleanValue()); break; case INT: - // TODO amzn/ion-java/issues/9 Inefficient since we can't determine the size + // TODO amazon-ion/ion-java/issues/9 Inefficient since we can't determine the size // of the integer in order to avoid making BigIntegers. v = newInt(reader.bigIntegerValue()); break; diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java index 598c4a0a6a..203ecdf43d 100644 --- a/src/com/amazon/ion/impl/lite/IonValueLite.java +++ b/src/com/amazon/ion/impl/lite/IonValueLite.java @@ -310,7 +310,7 @@ public SymbolTable getSymbolTable() this._annotations[i] = _Private_Utils.newSymbolToken(text, UNKNOWN_SYMBOL_ID); } else { - // TODO - amzn/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail + // TODO - amazon-ion/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail this._annotations[i] = existing._annotations[i]; hasSIDsRetained |= this._annotations[i].getSid() > UNKNOWN_SYMBOL_ID; } @@ -325,7 +325,7 @@ public SymbolTable getSymbolTable() // existing 'read only' flag - we force the deep-copy back to being mutable clear_flag(IS_LOCKED); // whilst the clone *should* guarantee symbol context is purged, the annotation behavior existing above - // under the TO DO for amzn/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore + // under the TO DO for amazon-ion/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore // the encoding flag has to reflect this reality _isSymbolIdPresent(hasSIDsRetained); } @@ -467,7 +467,7 @@ public final int getFieldId() public SymbolToken getFieldNameSymbol() { - // TODO amzn/ion-java/issues/27 We should memoize the results of symtab lookups. + // TODO amazon-ion/ion-java/issues/27 We should memoize the results of symtab lookups. // BUT: that could cause thread-safety problems for read-only values. // I think makeReadOnly should populate the tokens fully // so that we only need to lookup from mutable instances. @@ -613,7 +613,7 @@ public final String getFieldName() if (_fieldName != null) return _fieldName; if (_fieldId <= 0) return null; - // TODO amzn/ion-java/issues/27 why no symtab lookup, like getFieldNameSymbol()? + // TODO amazon-ion/ion-java/issues/27 why no symtab lookup, like getFieldNameSymbol()? throw new UnknownSymbolException(_fieldId); } @@ -683,7 +683,7 @@ public final SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTa String text = token.getText(); if (text != null && token.getSid() == UNKNOWN_SYMBOL_ID) { - // TODO amzn/ion-java/issues/27 We should memoize the result of symtab lookups + // TODO amazon-ion/ion-java/issues/27 We should memoize the result of symtab lookups // into _annotations. // See getFieldNameSymbol() for challenges doing so. diff --git a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java index 250ca1e0f9..8db8187856 100644 --- a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java +++ b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java @@ -1161,7 +1161,7 @@ private void writeIonStructContent(IonStruct val) { final int originalOffset = myBuffer.length - myOffset; - // TODO amzn/ion-java/issues/31 should not preserve the ordering of fields + // TODO amazon-ion/ion-java/issues/31 should not preserve the ordering of fields ArrayList values = new ArrayList(); // Fill ArrayList with IonValues, the add() just copies the @@ -1182,7 +1182,7 @@ private void writeIonStructContent(IonStruct val) writeVarUInt(sid); } - // TODO amzn/ion-java/issues/41 Detect if the struct fields are sorted in ascending + // TODO amazon-ion/ion-java/issues/41 Detect if the struct fields are sorted in ascending // order of Sids. If so, 1 should be written into 'length' field. // Note that this 'length' field is not the same as the four-bit // length L in the type descriptor octet. @@ -1273,7 +1273,7 @@ private int findSid(SymbolToken symToken) * have different Ion versions. * * - * TODO amzn/ion-java/issues/25 Currently, {@link IonDatagram#systemIterator()} doesn't + * TODO amazon-ion/ion-java/issues/25 Currently, {@link IonDatagram#systemIterator()} doesn't * retain information about interspersed IVMs within the IonDatagram. * As such, we cannot obtain the location of interspersed IVMs, if any. * diff --git a/src/com/amazon/ion/impl/lite/TopLevelContext.java b/src/com/amazon/ion/impl/lite/TopLevelContext.java index 797ff6c9cc..a3b88b7776 100644 --- a/src/com/amazon/ion/impl/lite/TopLevelContext.java +++ b/src/com/amazon/ion/impl/lite/TopLevelContext.java @@ -40,7 +40,7 @@ final class TopLevelContext * symbol table and following the parent/owning_context * chain will lead to a system object. *

- * TODO amzn/ion-java/issues/19 we cannot assume that the IonSystem knows the proper IVM + * TODO amazon-ion/ion-java/issues/19 we cannot assume that the IonSystem knows the proper IVM * in this context */ private final SymbolTable _symbols; diff --git a/src/com/amazon/ion/overview.html b/src/com/amazon/ion/overview.html index cf81a4bda3..7d993c1bdd 100644 --- a/src/com/amazon/ion/overview.html +++ b/src/com/amazon/ion/overview.html @@ -16,7 +16,7 @@ ion-java is the reference implementation of the -Ion data notation for the +Ion data notation for the JavaTM 2 Platform Standard Edition 5.0 and above.

diff --git a/src/com/amazon/ion/system/IonTextWriterBuilder.java b/src/com/amazon/ion/system/IonTextWriterBuilder.java index 3f201c6137..b88fb4bca0 100644 --- a/src/com/amazon/ion/system/IonTextWriterBuilder.java +++ b/src/com/amazon/ion/system/IonTextWriterBuilder.java @@ -66,7 +66,7 @@ *

* Currently, there is no configuration point available to disable the * auto-flushing mechanism. Please vote on - * issue amzn/ion-java/issues/32 + * issue amazon-ion/ion-java/issues/32 * if you require it. * */ diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/com/amazon/ion/util/Equivalence.java index 70759b884f..371cb4c8b0 100644 --- a/src/com/amazon/ion/util/Equivalence.java +++ b/src/com/amazon/ion/util/Equivalence.java @@ -123,7 +123,7 @@ *

Terminology

* Within this class, strict equivalence refers to Ion data model * equivalence as defined above and by the - * Ion + * Ion * Specification. Structural or non-strict equivalence * follows the same rules as strict equivalence, except that *
    @@ -135,7 +135,7 @@ public final class Equivalence { /** - * TODO amzn/ion-java/issues/26 Marker for code that needs to be altered in order to + * TODO amazon-ion/ion-java/issues/26 Marker for code that needs to be altered in order to * support a public comparison API to determine ordering of values, not * just equality. */ @@ -434,7 +434,7 @@ static class Field { SymbolToken tok = value.getFieldNameSymbol(); String name = tok.getText(); if (name == null) { - // TODO amzn/ion-java/issues/23 Problematic with unknown field names. + // TODO amazon-ion/ion-java/issues/23 Problematic with unknown field names. name = UNKNOWN_SYMBOL_TEXT_PREFIX + tok.getSid(); } this.name = name; @@ -448,7 +448,7 @@ static class Field { @Override public int hashCode() { return name.hashCode(); - // TODO amzn/ion-java/issues/58 : implement hash code such that it respects + // TODO amazon-ion/ion-java/issues/58 : implement hash code such that it respects // 'strict'. The prevously attempted fix is commented out below but // is not sufficient because value.hasCode will always include // type annotations in the hash computation. Type annotations @@ -538,14 +538,14 @@ private static int ionCompareToImpl(final IonValue v1, } break; case DECIMAL: - assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26 + assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26 result = Decimal.equals(((IonDecimal) v1).decimalValue(), ((IonDecimal) v2).decimalValue()) ? 0 : 1; break; case TIMESTAMP: if (configuration.isStrict) { - assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26 + assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26 result = (((IonTimestamp) v1).timestampValue().equals( ((IonTimestamp) v2).timestampValue()) ? 0 : 1); @@ -573,7 +573,7 @@ private static int ionCompareToImpl(final IonValue v1, result = compareLobContents((IonLob) v1, (IonLob) v2); break; case STRUCT: - assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26 + assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26 result = compareStructs((IonStruct) v1, (IonStruct) v2, configuration); diff --git a/test/com/amazon/ion/CloneTest.java b/test/com/amazon/ion/CloneTest.java index b9cb52d253..fbde87f6c4 100644 --- a/test/com/amazon/ion/CloneTest.java +++ b/test/com/amazon/ion/CloneTest.java @@ -60,7 +60,7 @@ public void testDifferentValueFactoryCloneWithUnknownSymbolText() SymbolToken tok = newSymbolToken(99); IonSymbol original = system().newSymbol(tok); - // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but + // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but // it isn't thrown. IonSymbol copy = otherSystem.clone(original); @@ -99,7 +99,7 @@ public void testDifferentValueFactoryCloneWithUnknownAnnotationText() IonInt original = system().newInt(5); original.setTypeAnnotationSymbols(tok); - // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but + // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but // it isn't thrown. IonInt copy = otherSystem.clone(original); @@ -153,7 +153,7 @@ public void testDifferentValueFactoryCloneWithUnknownFieldNameText() // This works since the cloned child doesn't retain its field name. otherSystem.clone(child); - // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but + // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but // it isn't thrown. IonStruct copy = otherSystem.clone(original); diff --git a/test/com/amazon/ion/ContainerTestCase.java b/test/com/amazon/ion/ContainerTestCase.java index 6ca1b7626a..55a9e505cc 100644 --- a/test/com/amazon/ion/ContainerTestCase.java +++ b/test/com/amazon/ion/ContainerTestCase.java @@ -242,7 +242,7 @@ public void testRemoveFromContainer() } - /** TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs */ + /** TODO amazon-ion/ion-java/issues/8 datagram is lazy creating local symtabs */ @Test @Ignore public void testDetachHasDifferentSymtab() { @@ -352,7 +352,7 @@ public void testRemovingReadOnlyChild() assertSame(n, c.iterator().next()); } - /** TODO amzn/ion-java/issues/6 */ + /** TODO amazon-ion/ion-java/issues/6 */ @Test @Ignore public void testSelfContainment() { diff --git a/test/com/amazon/ion/DatagramTest.java b/test/com/amazon/ion/DatagramTest.java index 9193cfabac..493efb7eda 100644 --- a/test/com/amazon/ion/DatagramTest.java +++ b/test/com/amazon/ion/DatagramTest.java @@ -164,7 +164,7 @@ public void testManualIVM() assertSame(systemSymtab_1_0, sysId.getSymbolTable()); - // TODO amzn/ion-java/issues/20 + // TODO amazon-ion/ion-java/issues/20 // assertEquals(0, dg.size()); // TODO adding $ion_1_1 should fail: unsupported version @@ -415,7 +415,7 @@ public void testAddingDatagramToDatagram() } catch (IllegalArgumentException e) { } - // Cannot insert a datagram // TODO amzn/ion-java/issues/48 + // Cannot insert a datagram // TODO amazon-ion/ion-java/issues/48 // try // { // dg1.add(1, dg2); @@ -498,7 +498,7 @@ public void testNewDatagramWithImports() public void testEmptyDatagram() { IonDatagram dg = loader().load(""); -// testEmptySequence(dg); // TODO amzn/ion-java/issues/48 implement add(int,v) +// testEmptySequence(dg); // TODO amazon-ion/ion-java/issues/48 implement add(int,v) dg.add().newInt(1); testClearContainer(dg); } @@ -508,7 +508,7 @@ public void testEmptyDatagram() @Test public void testRemoveViaIteratorThenDirect() { - // TODO amzn/ion-java/issues/51 implement remove on datagram iterator + // TODO amazon-ion/ion-java/issues/51 implement remove on datagram iterator } @@ -570,7 +570,7 @@ public void testClearAfterClone() @Test public void testToString() { - // TODO amzn/ion-java/issues/8 I think this is wrong, the datagram has injected IVM + // TODO amazon-ion/ion-java/issues/8 I think this is wrong, the datagram has injected IVM IonDatagram dg = loader().load("1"); assertEquals("$ion_1_0 1", dg.toString()); @@ -671,7 +671,7 @@ public void testGetAssignedSymbolTable() } /** - * TODO amzn/ion-java/issues/50 Datagram.set() should work, but it's documented to throw + * TODO amazon-ion/ion-java/issues/50 Datagram.set() should work, but it's documented to throw */ @Test(expected = UnsupportedOperationException.class) public void testSet() diff --git a/test/com/amazon/ion/FloatTest.java b/test/com/amazon/ion/FloatTest.java index da7c273918..7d9140fa9c 100644 --- a/test/com/amazon/ion/FloatTest.java +++ b/test/com/amazon/ion/FloatTest.java @@ -206,7 +206,7 @@ public void checkSpecial(float expectedFloat, } /** - * TODO amzn/ion-java#64 Un-ignore this when all dependent build pipelines + * TODO amazon-ion/ion-java#64 Un-ignore this when all dependent build pipelines * use a version of the JVM that doesn't have this defect. * * https://blogs.oracle.com/security/entry/security_alert_for_cve-2010-44 diff --git a/test/com/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java index 92af228d3c..7158341d59 100644 --- a/test/com/amazon/ion/IonTestCase.java +++ b/test/com/amazon/ion/IonTestCase.java @@ -1104,7 +1104,7 @@ public void testValueFactoryClone(IonValue original, IonValue clone = newFactory.clone(original); IonAssert.assertIonEquals(original, clone); - // TODO amzn/ion-java/issues/30 IonSystemLite.clone() on a value that is in IonSystemImpl + // TODO amazon-ion/ion-java/issues/30 IonSystemLite.clone() on a value that is in IonSystemImpl // doesn't seem to copy over local symbol tables. // assertEquals(original.toString(), clone.toString()); diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java index eb2a6bb111..27fd82faee 100644 --- a/test/com/amazon/ion/IonValueTest.java +++ b/test/com/amazon/ion/IonValueTest.java @@ -144,7 +144,7 @@ public void testSetTypeAnnotationInterning() IonValue v = system().newNull(); v.setTypeAnnotations(nameCopy); - // TODO amzn/ion-java/issues/21 fails because v doesn't have any symbol table at all + // TODO amazon-ion/ion-java/issues/21 fails because v doesn't have any symbol table at all // assertSame(nameOrig, v.getTypeAnnotations()[0]); // assertSame(nameOrig, v.getTypeAnnotationSymbols()[0].getText()); } @@ -289,7 +289,7 @@ public void testCustomToString() v.toString(IonTextWriterBuilder.standard() .withInitialIvmHandling(InitialIvmHandling.ENSURE))); - // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines + // TODO amazon-ion/ion-java/issues/57 determine if these really should be platform independent newlines final String pretty = format("%n[%n hello,%n a::12%n]"); assertEquals(pretty, v.toString(IonTextWriterBuilder.pretty())); diff --git a/test/com/amazon/ion/NopPaddingTest.java b/test/com/amazon/ion/NopPaddingTest.java index 1ecf5eac65..51ac3a82c7 100644 --- a/test/com/amazon/ion/NopPaddingTest.java +++ b/test/com/amazon/ion/NopPaddingTest.java @@ -17,7 +17,7 @@ import org.junit.Test; /** - * Testing support for NOP padding for empty Ion, see spec for more details + * Testing support for NOP padding for empty Ion, see spec for more details */ public class NopPaddingTest extends IonTestCase diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java index 3024a40fd5..4e1b00e9a1 100644 --- a/test/com/amazon/ion/RoundTripTest.java +++ b/test/com/amazon/ion/RoundTripTest.java @@ -42,13 +42,13 @@ * Processes all text files in the "good" suite, transforming between text and * binary twice to ensure that the process is equivalent. * - * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in + * TODO amazon-ion/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in * {@link RoundTripStreamingTest}. */ public class RoundTripTest extends IonTestCase { - // TODO amzn/ion-java/issues/27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter) + // TODO amazon-ion/ion-java/issues/27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter) // will throw UnknownSymbolException if symbol text is unknown public static final FilenameFilter ROUND_TRIP_TEST_SKIP_LIST = new FileIsNot("good/symbols.ion"); diff --git a/test/com/amazon/ion/SequenceTestCase.java b/test/com/amazon/ion/SequenceTestCase.java index 41e8a2af6a..2b46024cf6 100644 --- a/test/com/amazon/ion/SequenceTestCase.java +++ b/test/com/amazon/ion/SequenceTestCase.java @@ -570,7 +570,7 @@ public void testRetainAll() (Object)nullValue2); IonSequence seq = makeEmpty(); - // TODO amzn/ion-java/issues/49 implement IonDatagram.retainAll + // TODO amazon-ion/ion-java/issues/49 implement IonDatagram.retainAll if (seq.getType() == IonType.DATAGRAM) return; assertFalse(seq.retainAll(empty)); diff --git a/test/com/amazon/ion/SystemProcessingTestCase.java b/test/com/amazon/ion/SystemProcessingTestCase.java index 24b9334787..50c045e918 100644 --- a/test/com/amazon/ion/SystemProcessingTestCase.java +++ b/test/com/amazon/ion/SystemProcessingTestCase.java @@ -192,7 +192,7 @@ protected abstract void checkEof() //========================================================================= - /** TODO amzn/ion-java/issues/8 This is broken for loaders which are now more lazy */ + /** TODO amazon-ion/ion-java/issues/8 This is broken for loaders which are now more lazy */ @Test @Ignore public void testLocalTableResetting() throws Exception @@ -1053,7 +1053,7 @@ public void testSystemIterationShowsIvm() checkEof(); } - // TODO amzn/ion-java/issues/25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm + // TODO amazon-ion/ion-java/issues/25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm @Test public void testHighUnicodeDirectInBlob() diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java index f278c46ede..c8177b0e42 100644 --- a/test/com/amazon/ion/TestUtils.java +++ b/test/com/amazon/ion/TestUtils.java @@ -139,17 +139,17 @@ public boolean accept(File dir, String name) // Skips documentation that accompanies some test vectors NOT_MARKDOWN_FILTER, new FileIsNot( - "bad/clobWithNullCharacter.ion" // TODO amzn/ion-java/43 - ,"bad/emptyAnnotatedInt.10n" // TODO amzn/ion-java/55 - ,"good/subfieldVarUInt32bit.ion" // TODO amzn/ion-java/62 + "bad/clobWithNullCharacter.ion" // TODO amazon-ion/ion-java/43 + ,"bad/emptyAnnotatedInt.10n" // TODO amazon-ion/ion-java/55 + ,"good/subfieldVarUInt32bit.ion" // TODO amazon-ion/ion-java/62 ,"good/subfieldVarUInt.ion" // Note: this passes but takes too long. That's fine; it's not a realistic use case. - ,"good/utf16.ion" // TODO amzn/ion-java/61 - ,"good/utf32.ion" // TODO amzn/ion-java/61 + ,"good/utf16.ion" // TODO amazon-ion/ion-java/61 + ,"good/utf32.ion" // TODO amazon-ion/ion-java/61 ,"good/whitespace.ion" - ,"good/item1.10n" // TODO amzn/ion-java#126 (roundtrip symbols with unknown text) - ,"bad/typecodes/type_6_length_0.10n" // TODO amzn/ion-java#272 - ,"good/typecodes/T7-large.10n" // TODO amzn/ion-java#273 - ,"good/equivs/clobNewlines.ion" // TODO amzn/ion-java#274 + ,"good/item1.10n" // TODO amazon-ion/ion-java#126 (roundtrip symbols with unknown text) + ,"bad/typecodes/type_6_length_0.10n" // TODO amazon-ion/ion-java#272 + ,"good/typecodes/T7-large.10n" // TODO amazon-ion/ion-java#273 + ,"good/equivs/clobNewlines.ion" // TODO amazon-ion/ion-java#274 ) ); diff --git a/test/com/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java index fb9129cf2d..85f8394c03 100644 --- a/test/com/amazon/ion/TimestampTest.java +++ b/test/com/amazon/ion/TimestampTest.java @@ -881,14 +881,14 @@ public void forEpochSecondTestNanosTooHigh() { } @Test - @Ignore("https://github.com/amzn/ion-java/issues/303") + @Ignore("https://github.com/amazon-ion/ion-java/issues/303") public void forEpochSecondTesOffsetTooLow() { thrown.expect(IllegalArgumentException.class); Timestamp.forEpochSecond(0, 0, -24 * 60); } @Test - @Ignore("https://github.com/amzn/ion-java/issues/303") + @Ignore("https://github.com/amazon-ion/ion-java/issues/303") public void forEpochSecondTestOffsetTooHigh() { thrown.expect(IllegalArgumentException.class); Timestamp.forEpochSecond(0, 0, 24 * 60); @@ -3063,7 +3063,7 @@ public void testMillisIsIndepedentOfOffset() throws ParseException { @Test public void testInstantVsTimestampMillis() { /* If ion-java migrates to Java 8, which added Instant, this test becomes valid. - // addresses: https://github.com/amzn/ion-java/issues/165 + // addresses: https://github.com/amazon-ion/ion-java/issues/165 String tsText = "0001-01-01T00:00:00.000Z"; // Instant extends the Gregorian calendar system all the way back to the beginning, whereas Timestamp uses // the default GregorianCalendar implementation, which transitions from Julian to Gregorian in 1582. As a diff --git a/test/com/amazon/ion/TrBwBrProcessingTest.java b/test/com/amazon/ion/TrBwBrProcessingTest.java index f49cfca0d5..76b3e9e8f9 100644 --- a/test/com/amazon/ion/TrBwBrProcessingTest.java +++ b/test/com/amazon/ion/TrBwBrProcessingTest.java @@ -40,7 +40,7 @@ protected void prepare(String text) @Ignore @Test public void testLocalSymtabWithMalformedSymbolEntries() throws Exception { - // TODO amzn/ion-java#151 this test exercises null slots in the local symbol table. The reader should collapse + // TODO amazon-ion/ion-java#151 this test exercises null slots in the local symbol table. The reader should collapse // all local symbol table null slots to $0. Currently, since this doesn't happen, the reader passes $10 to the // writer, which fails due to an out-of-range symbol ID. super.testLocalSymtabWithMalformedSymbolEntries(); diff --git a/test/com/amazon/ion/TrueSequenceTestCase.java b/test/com/amazon/ion/TrueSequenceTestCase.java index 22ef0a8708..8b1ea49edd 100644 --- a/test/com/amazon/ion/TrueSequenceTestCase.java +++ b/test/com/amazon/ion/TrueSequenceTestCase.java @@ -82,7 +82,7 @@ public void testNullSequenceIndexedAddAll() /** - * TODO amzn/ion-java/issues/47 Implement indexed addAll for datagram + * TODO amazon-ion/ion-java/issues/47 Implement indexed addAll for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -155,7 +155,7 @@ public void testIndexedAddAll(IonSequence seq) /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -208,7 +208,7 @@ private void set(IonSequence s, int index) /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -220,7 +220,7 @@ public void testSetNullElement() /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -234,7 +234,7 @@ public void testSetContainedValue() /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -247,7 +247,7 @@ public void testSetDatagram() /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -261,7 +261,7 @@ public void testSetReadOnlyChild() /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test @@ -275,7 +275,7 @@ public void testSetReadOnlyContainer() /** - * TODO amzn/ion-java/issues/50 Implement set for datagram + * TODO amazon-ion/ion-java/issues/50 Implement set for datagram * Hoist this up to SequencenceTestCase. */ @Test diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java index 8ab10fdcef..cf4b910bf1 100644 --- a/test/com/amazon/ion/impl/BinaryWriterTest.java +++ b/test/com/amazon/ion/impl/BinaryWriterTest.java @@ -53,7 +53,7 @@ public void testWriteSymbolWithLockedSymtab() throws Exception { iw = makeWriter(); - iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8 + iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8 iw.getSymbolTable().makeReadOnly(); thrown.expect(IonException.class); iw.writeSymbol("s"); @@ -64,7 +64,7 @@ public void testAddTypeAnnotationWithLockedSymtab() throws Exception { iw = makeWriter(); - iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8 + iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8 iw.getSymbolTable().makeReadOnly(); thrown.expect(IonException.class); iw.addTypeAnnotation("a"); @@ -75,7 +75,7 @@ public void testSetFieldNameWithLockedSymtab() throws Exception { iw = makeWriter(); - iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8 + iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8 iw.getSymbolTable().makeReadOnly(); iw.stepIn(IonType.STRUCT); thrown.expect(IonException.class); diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/com/amazon/ion/impl/IonMarkupWriterTest.java index b84d7a7da0..bfc78d4212 100644 --- a/test/com/amazon/ion/impl/IonMarkupWriterTest.java +++ b/test/com/amazon/ion/impl/IonMarkupWriterTest.java @@ -49,7 +49,7 @@ public class IonMarkupWriterTest extends IonTestCase { "" + "{{T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl}}}"; - // TODO amzn/ion-java/issues/57 determine if platform specific newlines are appropriate for pretty printing + // TODO amazon-ion/ion-java/issues/57 determine if platform specific newlines are appropriate for pretty printing private String pExpected = String.format( "%nabcd" + ":: it = systemIterateOutput(); - if (myOutputForm != OutputForm.TEXT) { // TODO amzn/ion-java/issues/8 + if (myOutputForm != OutputForm.TEXT) { // TODO amazon-ion/ion-java/issues/8 checkSymbol(SystemSymbols.ION_1_0, it.next()); } checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next()); - // TODO amzn/ion-java#14 + // TODO amazon-ion/ion-java#14 if (myOutputForm != OutputForm.TEXT) { checkSymbol(null, 12, it.next()); @@ -939,7 +939,7 @@ public void testWritingEmptySymtab() } - @Test @Ignore // TODO amzn/ion-java/issues/15 + @Test @Ignore // TODO amazon-ion/ion-java/issues/15 public void testWritingSymtabWithExtraAnnotations() throws Exception { @@ -1028,7 +1028,7 @@ public void testWriteValuesWithSymtab() } /** - * TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs. + * TODO amazon-ion/ion-java/issues/8 datagram is lazy creating local symtabs. * Should use a reader to check the results. */ @Test @@ -1049,7 +1049,7 @@ public void testWriteIVMImplicitly() if (myOutputForm == OutputForm.BINARY) { checkAnnotation(ION_SYMBOL_TABLE, it.next()); } - // TODO amzn/ion-java#14 + // TODO amazon-ion/ion-java#14 if (myOutputForm == OutputForm.BINARY) { checkSymbol(null, 10, it.next()); @@ -1077,7 +1077,7 @@ public void testWriteIVMExplicitly() assertEquals(2, dg.size()); } - @Test // TODO amzn/ion-java/issues/8 Inconsistencies between writers + @Test // TODO amazon-ion/ion-java/issues/8 Inconsistencies between writers public void testWritingDatagram() throws Exception { @@ -1093,7 +1093,7 @@ public void testWritingDatagram() checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next()); } - // TODO amzn/ion-java#14 + // TODO amazon-ion/ion-java#14 if (myOutputForm != OutputForm.TEXT) { checkSymbol(null, 10, it.next()); diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java index 850fa54ac4..ec2c379fe3 100644 --- a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java +++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java @@ -243,7 +243,7 @@ public void testOptimizedWriteValueDiffImports() /** * Writer's imports superset of Reader's: (could be) fully optimized. - * TODO amzn/ion-java/issues/18 at the moment the compatability code requires + * TODO amazon-ion/ion-java/issues/18 at the moment the compatability code requires * exact-match on imports. */ @Test @@ -289,7 +289,7 @@ public void testOptimizedWriteValueSubsetWriterImport() /** * Reader's source contains interspersed LSTs. - * TODO amzn/ion-java/issues/39 Investigate allowing a config. option to copy reader's LST + * TODO amazon-ion/ion-java/issues/39 Investigate allowing a config. option to copy reader's LST * over to the writer. */ @Test diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java index cb44b93335..c96fdbf25b 100644 --- a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java +++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java @@ -178,9 +178,9 @@ protected void checkWriteValue(boolean expectedTransferInvoked) // Reset flag before calling IonWriter.writeValue isTransferCurrentValueInvoked = false; - // TODO amzn/ion-java/issues/16 - Currently, doesn't copy annotations or field names, + // TODO amazon-ion/ion-java/issues/16 - Currently, doesn't copy annotations or field names, // so we always expect no transfer of raw bytes - // TODO amzn/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer + // TODO amazon-ion/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer // facet. Once this is fixed, remove the `asFacet` check below. if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0 || ir.asFacet(_Private_ByteTransferReader.class) == null) diff --git a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java index 4093ae4b6d..6e33014b06 100644 --- a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java +++ b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java @@ -139,12 +139,12 @@ public void testFlushingLockedSymtab() { iw = makeWriter(); - // Force a local symtab. TODO amzn/ion-java/issues/8 Should have an API for this + // Force a local symtab. TODO amazon-ion/ion-java/issues/8 Should have an API for this iw.addTypeAnnotation(SystemSymbols.ION_SYMBOL_TABLE); iw.stepIn(IonType.STRUCT); iw.stepOut(); - SymbolTable symtab = iw.getSymbolTable(); // TODO amzn/ion-java/issues/22 + SymbolTable symtab = iw.getSymbolTable(); // TODO amazon-ion/ion-java/issues/22 symtab.intern("fred_1"); symtab.intern("fred_2"); testFlushing(); diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java index a1a49073c7..97fe16d153 100644 --- a/test/com/amazon/ion/impl/SymbolTableTest.java +++ b/test/com/amazon/ion/impl/SymbolTableTest.java @@ -755,7 +755,7 @@ public void testDupLocalSymbolOnDatagram() throws Exception { final IonMutableCatalog cat = new SimpleCatalog(); cat.putTable(st); - // amzn/ion-java/issues/46 has the datagram producing something like: + // amazon-ion/ion-java/issues/46 has the datagram producing something like: // $ion_1_0 $ion_symbol_table::{imports:[{name: "foobar", version: 1, max_id: 1}], symbols: ["s1", "l1"]} $11 $12 // local table should not have "s1", user values should be $10 $11 IonDatagram dg = ion1.newDatagram(st); @@ -1049,7 +1049,7 @@ public void testSharedSymtabCreationWithDuplicates() } - @Test @Ignore // TODO amzn/ion-java/issues/12 + @Test @Ignore // TODO amazon-ion/ion-java/issues/12 public void testSharedSymtabCreationWithEmptyName() { String[] syms = { "a", "b", "", "c" }; diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java index 1601c3e79e..60dd1ccf74 100644 --- a/test/com/amazon/ion/impl/TextWriterTest.java +++ b/test/com/amazon/ion/impl/TextWriterTest.java @@ -282,7 +282,7 @@ public void testWritingLongStrings() options.withPrettyPrinting(); expectRendering( - // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines + // TODO amazon-ion/ion-java/issues/57 determine if these really should be platform independent newlines format( "%n" + "'''looong'''%n" + diff --git a/test/com/amazon/ion/impl/ValueWriterTest.java b/test/com/amazon/ion/impl/ValueWriterTest.java index 730ce7158e..07f7b72a4f 100644 --- a/test/com/amazon/ion/impl/ValueWriterTest.java +++ b/test/com/amazon/ion/impl/ValueWriterTest.java @@ -138,13 +138,13 @@ public void testWriteValuesWithSymtabIntoContainer() } - @Override @Test @Ignore // TODO amzn/ion-java/issues/8 + @Override @Test @Ignore // TODO amazon-ion/ion-java/issues/8 public void testWriteIVMImplicitly() throws Exception { super.testWriteIVMImplicitly(); - // TODO amzn/ion-java/issues/20 + // TODO amazon-ion/ion-java/issues/20 // assertEquals(2, myDatagram.size()); } @@ -154,7 +154,7 @@ public void testWriteIVMExplicitly() throws Exception { super.testWriteIVMExplicitly(); - // TODO amzn/ion-java/issues/20 + // TODO amazon-ion/ion-java/issues/20 //assertEquals(2, myDatagram.size()); } } diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java index c50a2e6427..05a3e29d1d 100644 --- a/test/com/amazon/ion/junit/IonAssert.java +++ b/test/com/amazon/ion/junit/IonAssert.java @@ -86,7 +86,7 @@ public static void assertNoCurrentValue(IonReader in) assertTrue(in.getFieldId() < 0); assertNull(in.getFieldNameSymbol()); - // TODO amzn/ion-java/issues/13 Text reader doesn't throw, but others do. + // TODO amazon-ion/ion-java/issues/13 Text reader doesn't throw, but others do. try { String[] ann = in.getTypeAnnotations(); assertEquals(0, ann.length); diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/test/com/amazon/ion/streaming/BinaryStreamingTest.java index 46b843f646..692d1ef0d8 100644 --- a/test/com/amazon/ion/streaming/BinaryStreamingTest.java +++ b/test/com/amazon/ion/streaming/BinaryStreamingTest.java @@ -63,7 +63,7 @@ static class TestValue { value = tv_value; } - /** TODO amzn/ion-java/issues/5 why this context? I think it will round-off values */ + /** TODO amazon-ion/ion-java/issues/5 why this context? I think it will round-off values */ static MathContext context = MathContext.DECIMAL128; static Decimal makeBigDecimal(double d) { Decimal bd = Decimal.valueOf(d, context); diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java index 3627a839eb..83ba276449 100644 --- a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java +++ b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java @@ -63,7 +63,7 @@ public abstract class ReaderFacetTestCase * * @see NonSeekableReaderTest */ - public static final ReaderMaker[] NON_SEEKABLE_READERS = // TODO amzn/ion-java/issues/17 + public static final ReaderMaker[] NON_SEEKABLE_READERS = // TODO amazon-ion/ion-java/issues/17 { ReaderMaker.FROM_INPUT_STREAM_BINARY, ReaderMaker.FROM_INPUT_STREAM_TEXT, diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java index ea822acdd8..219f222050 100644 --- a/test/com/amazon/ion/streaming/ReaderTest.java +++ b/test/com/amazon/ion/streaming/ReaderTest.java @@ -306,7 +306,7 @@ public void testReadingFloatAsBigInteger() * it's not what one would expect. */ @Test @Ignore - public void testReadingFloatAsBigDecimal() // TODO amzn/ion-java/issues/56 + public void testReadingFloatAsBigDecimal() // TODO amazon-ion/ion-java/issues/56 { BigDecimal actualBd = readBigDecimal("null.float"); assertEquals(in.isNullValue(), actualBd == null); @@ -428,7 +428,7 @@ public void testSkippingLobInStruct() public void testReadLobUsingGetBytes() throws Exception { if (!myReaderMaker.sourceIsBinary()) { - // TODO text implements getBytes() differently: https://github.com/amzn/ion-java/issues/319 + // TODO text implements getBytes() differently: https://github.com/amazon-ion/ion-java/issues/319 return; } String data = "{{\"abcdefghijklmnopqrstuvwxyz\"}}"; diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java index 98b27e1dcf..1ee28f8af3 100644 --- a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java +++ b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java @@ -44,7 +44,7 @@ import org.junit.Test; /** - * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in + * TODO amazon-ion/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in * {@link RoundTripTest}. */ public class RoundTripStreamingTest diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/test/com/amazon/ion/util/EquivalenceTest.java index 8a552ec1dc..ff559c66f0 100644 --- a/test/com/amazon/ion/util/EquivalenceTest.java +++ b/test/com/amazon/ion/util/EquivalenceTest.java @@ -368,7 +368,7 @@ public void testStringSymbol() { assertNotIonEq(ion("\"hi\""), ion("'hi'")); } - // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after + // TODO amazon-ion/ion-java/issues/58 : Remove the ignore annotation from this test after // making the required changes to Equivalence.Field.hashCode. @Ignore @Test @@ -400,7 +400,7 @@ public void testFieldEquals1() { assertTrue(f1.hashCode() != f3.hashCode()); } - // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after + // TODO amazon-ion/ion-java/issues/58 : Remove the ignore annotation from this test after // making the required changes to Equivalence.Field.hashCode. @Ignore @Test