Apply suggestions from PR feedback

Author: popematt

src/main/java/com/amazon/ion/impl/IonManagedWriterEncodingContext_1_1.kt

@@ -93,10 +93,8 @@ internal class IonManagedWriterEncodingContext_1_1 {
      *          make sure that any prior e-expressions are still valid. In addition, we would need to re-export all
      *          the other macros from `_` (the default module).
      *        - For now, we're just throwing an Exception.
-     *
-     * Visible for testing.
      */
-    fun getOrAssignMacroAddressAndName(name: String, macro: MacroImpl): Int {
+    private fun getOrAssignMacroAddressAndName(name: String, macro: MacroImpl): Int {
         // TODO: This is O(n), but could be O(1).
         var existingAddress = macroNames.indexOf(name)
         if (existingAddress < 0) {
@@ -131,7 +129,7 @@ internal class IonManagedWriterEncodingContext_1_1 {
      *    2. Check newMacros, if found, return that address
      *    3. Add to newMacros, return new address
      */
-    fun getOrAssignMacroAddress(macro: MacroImpl): Int {
+    private fun getOrAssignMacroAddress(macro: MacroImpl): Int {
         var address = macroTable.getOrDefault(macro, -1)
         if (address >= 0) return address
         address = newMacros.getOrDefault(macro, -1)
@@ -140,6 +138,13 @@ internal class IonManagedWriterEncodingContext_1_1 {
         return assignMacroAddress(macro)
     }
 
+    fun getOrAssignMacroAddress(macro: MacroImpl, name: String?): Int {
+        return if (name == null)
+            getOrAssignMacroAddress(macro)
+        else
+            getOrAssignMacroAddressAndName(name, macro)
+    }
+
     fun getMacroNameForId(id: Int): String? = macroNames[id]
 
     /** Unconditionally adds a macro to the macro table data structures and returns the new address. */

src/main/java/com/amazon/ion/impl/IonManagedWriterOptions_1_1.kt

@@ -32,6 +32,8 @@ internal class ManagedWriterOptions_1_1(
         BY_NAME,
         BY_ADDRESS,
     }
+
+    val useMacroNames = eExpressionIdentifierStrategy == EExpressionIdentifierStrategy.BY_NAME
 }
 
 /**