Refactoring

Author: komamitsu

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

@@ -0,0 +1,41 @@
+//
+// MessagePack for Java
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+package org.msgpack.jackson.dataformat;
+
+import java.lang.reflect.Field;
+import java.util.function.Supplier;
+
+public final class JavaInfo
+{
+    static final Supplier<Boolean> STRING_VALUE_FIELD_IS_CHARS;
+    static {
+        boolean stringValueFieldIsChars = false;
+        try {
+            Field stringValueField = String.class.getDeclaredField("value");
+            stringValueFieldIsChars = stringValueField.getType() == char[].class;
+        }
+        catch (NoSuchFieldException ignored) {
+        }
+        if (stringValueFieldIsChars) {
+            STRING_VALUE_FIELD_IS_CHARS = () -> true;
+        }
+        else {
+            STRING_VALUE_FIELD_IS_CHARS = () -> false;
+        }
+    }
+
+    private JavaInfo() {}
+}

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

@@ -29,15 +29,15 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
+
+import static org.msgpack.jackson.dataformat.JavaInfo.STRING_VALUE_FIELD_IS_CHARS;
 
 public class MessagePackGenerator
         extends GeneratorBase
@@ -56,23 +56,6 @@ public class MessagePackGenerator
     private final List<Node> nodes;
     private boolean isElementsClosed = false;
 
-    static final Supplier<Boolean> STRING_VALUE_FIELD_IS_CHARS;
-    static {
-        boolean stringValueFieldIsChars = false;
-        try {
-            Field stringValueField = String.class.getDeclaredField("value");
-            stringValueFieldIsChars = stringValueField.getType() == char[].class;
-        }
-        catch (NoSuchFieldException ignored) {
-        }
-        if (stringValueFieldIsChars) {
-            STRING_VALUE_FIELD_IS_CHARS = () -> true;
-        }
-        else {
-            STRING_VALUE_FIELD_IS_CHARS = () -> false;
-        }
-    }
-
     private static final class AsciiCharString
     {
         public final byte[] bytes;
@@ -531,7 +514,7 @@ private void writeByteArrayTextKey(byte[] text, int offset, int len) throws IOEx
     }
 
     @Override
-    public void writeFieldName(String name) throws IOException
+    public void writeFieldName(String name)
     {
         if (STRING_VALUE_FIELD_IS_CHARS.get()) {
             char[] chars = name.toCharArray();
@@ -543,7 +526,7 @@ public void writeFieldName(String name) throws IOException
     }
 
     @Override
-    public void writeFieldName(SerializableString name) throws IOException
+    public void writeFieldName(SerializableString name)
     {
         if (name instanceof SerializedString) {
             writeFieldName(name.getValue());

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

@@ -41,6 +41,8 @@
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 
+import static org.msgpack.jackson.dataformat.JavaInfo.STRING_VALUE_FIELD_IS_CHARS;
+
 public class MessagePackParser
         extends ParserMinimalBase
 {
@@ -161,7 +163,7 @@ private String unpackString(MessageUnpacker messageUnpacker) throws IOException
         int strLen = messageUnpacker.unpackRawStringHeader();
         if (strLen <= tempBytes.length) {
             messageUnpacker.readPayload(tempBytes, 0, strLen);
-            if (MessagePackGenerator.STRING_VALUE_FIELD_IS_CHARS.get()) {
+            if (STRING_VALUE_FIELD_IS_CHARS.get()) {
                 for (int i = 0; i < strLen; i++) {
                     byte b = tempBytes[i];
                     if ((0x80 & b) != 0) {