Address feedback from @komamitsu

Author: brenbar

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java

@@ -39,7 +39,7 @@ public class MessagePackFactory
     private final MessagePack.PackerConfig packerConfig;
     private boolean reuseResourceInGenerator = true;
     private boolean reuseResourceInParser = true;
-    private boolean writeIntegerKeysAsStringKeys = true;
+    private boolean supportIntegerKeys = false;
     private ExtensionTypeCustomDeserializers extTypeCustomDesers;
 
     public MessagePackFactory()
@@ -75,9 +75,9 @@ public MessagePackFactory setReuseResourceInParser(boolean reuseResourceInParser
         return this;
     }
 
-    public MessagePackFactory setWriteIntegerKeysAsStringKeys(boolean writeIntegerKeysAsStringKeys)
+    public MessagePackFactory setSupportIntegerKeys(boolean supportIntegerKeys)
     {
-        this.writeIntegerKeysAsStringKeys = writeIntegerKeysAsStringKeys;
+        this.supportIntegerKeys = supportIntegerKeys;
         return this;
     }
 
@@ -91,7 +91,7 @@ public MessagePackFactory setExtTypeCustomDesers(ExtensionTypeCustomDeserializer
     public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc)
             throws IOException
     {
-        return new MessagePackGenerator(_generatorFeatures, _objectCodec, out, packerConfig, reuseResourceInGenerator, writeIntegerKeysAsStringKeys);
+        return new MessagePackGenerator(_generatorFeatures, _objectCodec, out, packerConfig, reuseResourceInGenerator, supportIntegerKeys);
     }
 
     @Override

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java

@@ -50,7 +50,7 @@ public class MessagePackGenerator
     private static final ThreadLocal<OutputStreamBufferOutput> messageBufferOutputHolder = new ThreadLocal<>();
     private final OutputStream output;
     private final MessagePack.PackerConfig packerConfig;
-    private final boolean writeIntegerKeysAsStringKeys;
+    private final boolean supportIntegerKeys;
 
     private int currentParentElementIndex = -1;
     private int currentState = IN_ROOT;
@@ -190,14 +190,14 @@ private MessagePackGenerator(
             ObjectCodec codec,
             OutputStream out,
             MessagePack.PackerConfig packerConfig,
-            boolean writeIntegerKeysAsStringKeys)
+            boolean supportIntegerKeys)
     {
         super(features, codec);
         this.output = out;
         this.messagePacker = packerConfig.newPacker(out);
         this.packerConfig = packerConfig;
         this.nodes = new ArrayList<>();
-        this.writeIntegerKeysAsStringKeys = writeIntegerKeysAsStringKeys;
+        this.supportIntegerKeys = supportIntegerKeys;
     }
 
     public MessagePackGenerator(
@@ -206,15 +206,15 @@ public MessagePackGenerator(
             OutputStream out,
             MessagePack.PackerConfig packerConfig,
             boolean reuseResourceInGenerator,
-            boolean writeIntegerKeysAsStringKeys)
+            boolean supportIntegerKeys)
             throws IOException
     {
         super(features, codec);
         this.output = out;
         this.messagePacker = packerConfig.newPacker(getMessageBufferOutputForOutputStream(out, reuseResourceInGenerator));
         this.packerConfig = packerConfig;
         this.nodes = new ArrayList<>();
-        this.writeIntegerKeysAsStringKeys = writeIntegerKeysAsStringKeys;
+        this.supportIntegerKeys = supportIntegerKeys;
     }
 
     private MessageBufferOutput getMessageBufferOutputForOutputStream(
@@ -378,7 +378,7 @@ else if (v instanceof MessagePackExtensionType) {
         else {
             messagePacker.flush();
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            MessagePackGenerator messagePackGenerator = new MessagePackGenerator(getFeatureMask(), getCodec(), outputStream, packerConfig, writeIntegerKeysAsStringKeys);
+            MessagePackGenerator messagePackGenerator = new MessagePackGenerator(getFeatureMask(), getCodec(), outputStream, packerConfig, supportIntegerKeys);
             getCodec().writeValue(messagePackGenerator, v);
             output.write(outputStream.toByteArray());
         }
@@ -521,11 +521,11 @@ private void writeByteArrayTextKey(byte[] text, int offset, int len) throws IOEx
     @Override
     public void writeFieldId(long id) throws IOException
     {
-        if (this.writeIntegerKeysAsStringKeys) {
-            super.writeFieldId(id);
+        if (this.supportIntegerKeys) {
+            addKeyNode(id);
         }
         else {
-            addKeyNode(id);
+            super.writeFieldId(id);
         }
     }
 

msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatForFieldIdTest.java

@@ -89,7 +89,7 @@ public void testMixedKeys()
     {
         ObjectMapper mapper = new ObjectMapper(
                     new MessagePackFactory()
-                        .setWriteIntegerKeysAsStringKeys(false)
+                        .setSupportIntegerKeys(true)
                 )
                 .registerModule(new SimpleModule()
                 .addDeserializer(Map.class, new MessagePackMapDeserializer()));