refactoring

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/io/JBBPOut.java

@@ -18,9 +18,9 @@
 
 import com.igormaznitsa.jbbp.exceptions.JBBPIOException;
 import com.igormaznitsa.jbbp.mapper.Bin;
+import com.igormaznitsa.jbbp.mapper.JBBPMapper;
 import com.igormaznitsa.jbbp.model.JBBPFieldShort;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -998,12 +998,12 @@ protected void assertNotEnded() {
    * Save fields of an object marked by Bin annotation. Fields will be ordered
    * through {@link Bin#outOrder()} field, NB! By default Java doesn't keep field
    * outOrder. Ordered fields of class will be saved into internal cache for speed
-   * but the cache can be reset through {@link #resetInsideClassCache()}
+   * but the cache can be reset through {@link JBBPMapper#clearFieldCache()}
    *
    * @param object an object to be saved into stream, must not be null
    * @return the context
    * @throws IOException it will be thrown for any transport error
-   * @see #resetInsideClassCache()
+   * @see JBBPMapper#clearFieldCache()
    * @see Bin
    * @since 1.1
    */
@@ -1015,14 +1015,14 @@ public JBBPOut Bin(final Object object) throws IOException {
    * Save fields of an object marked by Bin annotation. Fields will be ordered
    * through {@link Bin#outOrder()} field, NB! By default Java doesn't keep field
    * outOrder. Ordered fields of class will be saved into internal cache for speed
-   * but the cache can be reset through {@link #resetInsideClassCache()}
+   * but the cache can be reset through {@link JBBPMapper#clearFieldCache()}
    *
    * @param object            an object to be saved into stream, must not be null
    * @param customFieldWriter a custom field writer to be used for saving of
    *                          custom fields of the object, it can be null
    * @return the context
    * @throws IOException it will be thrown for any transport error
-   * @see #resetInsideClassCache()
+   * @see JBBPMapper#clearFieldCache()
    * @see Bin
    * @since 1.1
    */

jbbp/src/main/java/com/igormaznitsa/jbbp/mapper/MappedFieldRecord.java

@@ -411,6 +411,7 @@ private static <T> T tryMakeInstance(
 
 
   interface FieldProcessor {
+    @SuppressWarnings("unchecked")
     void apply(
         MappedFieldRecord record,
         JBBPFieldStruct rootStructure,

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPUtils.java

@@ -20,11 +20,9 @@
 import com.igormaznitsa.jbbp.io.JBBPBitOrder;
 import com.igormaznitsa.jbbp.io.JBBPByteOrder;
 import com.igormaznitsa.jbbp.model.JBBPAbstractField;
-
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -39,21 +37,15 @@
  */
 public final class JBBPUtils {
 
-  public static final String [] ARRAY_STRING_EMPTY = new String[0];
+  public static final String[] ARRAY_STRING_EMPTY = new String[0];
   public static final JBBPAbstractField[] ARRAY_FIELD_EMPTY = new JBBPAbstractField[0];
 
+  // Don't replace by StandardCharsets for Android compatibility!
   private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
 
   private JBBPUtils() {
   }
 
-  @SuppressWarnings("unchecked")
-  public static <T> T[] makeSingletoneArray(final T value) {
-      final Object[] result = (Object[])Array.newInstance(value.getClass(), 1);
-      result[0] = value;
-      return (T[])result; 
-  }
-  
   /**
    * Convert a string into its UTF8 representation.
    *