refactoring

Author: raydac

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

@@ -16,7 +16,6 @@
 
 package com.igormaznitsa.jbbp.utils;
 
-import com.igormaznitsa.jbbp.exceptions.JBBPException;
 import com.igormaznitsa.jbbp.mapper.Bin;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -86,23 +85,4 @@ public void onReachedMaxValueNumberForLine(final JBBPTextWriter context) throws
 
   }
 
-  /**
-   * Auxiliary method to extract field value.
-   *
-   * @param instance object instance, can be null
-   * @param field    the filed which value should be extracted, must not be null
-   * @return the field value
-   */
-  public Object extractFieldValue(final Object instance, final Field field) {
-    JBBPUtils.assertNotNull(field, "Field must not be null");
-    try {
-      if (ReflectUtils.isPotentiallyAccessibleField(field)) {
-        return field.get(instance);
-      } else {
-        return ReflectUtils.makeAccessible(field).get(instance);
-      }
-    } catch (Exception ex) {
-      throw new JBBPException("Can't extract value from field for exception", ex);
-    }
-  }
 }

jbbp/src/test/java/com/igormaznitsa/jbbp/it/Z80_v1_ParsingTest.java

@@ -16,6 +16,13 @@
 
 package com.igormaznitsa.jbbp.it;
 
+import static com.igormaznitsa.jbbp.io.JBBPByteOrder.LITTLE_ENDIAN;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+
 import com.igormaznitsa.jbbp.JBBPParser;
 import com.igormaznitsa.jbbp.io.JBBPBitNumber;
 import com.igormaznitsa.jbbp.io.JBBPBitOrder;
@@ -29,19 +36,15 @@
 import com.igormaznitsa.jbbp.model.JBBPFieldArrayByte;
 import com.igormaznitsa.jbbp.model.JBBPFieldBit;
 import com.igormaznitsa.jbbp.model.JBBPFieldStruct;
+import com.igormaznitsa.jbbp.utils.Function;
 import com.igormaznitsa.jbbp.utils.JBBPTextWriter;
 import com.igormaznitsa.jbbp.utils.JBBPTextWriterExtraAdapter;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
-import org.junit.jupiter.api.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
-
-import static com.igormaznitsa.jbbp.io.JBBPByteOrder.LITTLE_ENDIAN;
-import com.igormaznitsa.jbbp.utils.Function;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test to parse RLE encoded snapshots in well-known Z80 format (v.1) for
@@ -65,12 +68,30 @@ public void testRLEEncoding() throws Exception {
     assertArrayEquals(new byte[] {(byte) 0xED, (byte) 0xED, 8, 5, 1, 2, 3, 0x00, (byte) 0xED, (byte) 0xED, 0x00}, JBBPOut.BeginBin().Var(new RLEDataEncoder(), 1, new byte[] {5, 5, 5, 5, 5, 5, 5, 5, 1, 2, 3}).End().toByteArray());
   }
 
+  private static final Function<Class<?>, Object> INSTANTIATOR = aClass -> {
+    if (aClass == Flags.class) {
+      return new Flags();
+    }
+    if (aClass == EmulFlags.class) {
+      return new EmulFlags();
+    }
+    return null;
+  };
+
+  @Test
+  public void testParseAndWriteTestZ80WithoutCheckOfFields() throws Exception {
+    assertParseAndPackBack("test1.z80", 16059);
+    assertParseAndPackBack("test2.z80", 29330);
+    assertParseAndPackBack("test3.z80", 5711);
+    assertParseAndPackBack("test4.z80", 9946);
+  }
+
   private Z80Snapshot assertParseAndPackBack(final String name, final long etalonLen) throws Exception {
     final Z80Snapshot z80sn;
 
     final InputStream resource = getResourceAsInputStream(name);
     try {
-      z80sn = z80Parser.parse(resource).mapTo(new Z80Snapshot(), new DataProcessor(),INSTANTIATOR);
+      z80sn = z80Parser.parse(resource).mapTo(new Z80Snapshot(), new DataProcessor(), INSTANTIATOR);
       assertEquals(etalonLen, z80Parser.getFinalStreamByteCounter());
     } finally {
       JBBPUtils.closeQuietly(resource);
@@ -103,14 +124,6 @@ private Z80Snapshot assertParseAndPackBack(final String name, final long etalonL
     return z80sn;
   }
 
-  @Test
-  public void testParseAndWriteTestZ80WithoutCheckOfFields() throws Exception {
-    assertParseAndPackBack("test1.z80", 16059);
-    assertParseAndPackBack("test2.z80", 29330);
-    assertParseAndPackBack("test3.z80", 5711);
-    assertParseAndPackBack("test4.z80", 9946);
-  }
-
   @Test
   public void testParseAndWriteTestZ80WithCheckOfFields() throws Exception {
     final Z80Snapshot z80sn = assertParseAndPackBack("test.z80", 12429);
@@ -119,8 +132,12 @@ public void testParseAndWriteTestZ80WithCheckOfFields() throws Exception {
 
       @Override
       public String doConvertCustomField(JBBPTextWriter context, Object obj, Field field, Bin annotation) throws IOException {
-        final byte[] data = (byte[]) extractFieldValue(obj, field);
-        return "byte array length [" + data.length + ']';
+        try {
+          final byte[] data = (byte[]) field.get(obj);
+          return "byte array length [" + data.length + ']';
+        } catch (Exception ex) {
+          throw new RuntimeException(ex);
+        }
       }
 
     }).Bin(z80sn).Close().toString();
@@ -170,12 +187,6 @@ public String doConvertCustomField(JBBPTextWriter context, Object obj, Field fie
     assertTrue(summ > 0);
   }
 
-  private static final Function<Class<?>,Object> INSTANTIATOR = aClass -> {
-    if (aClass == Flags.class) return new Flags();
-    if (aClass == EmulFlags.class) return new EmulFlags();
-    return null;
-  };
-
   @Test
   public void testParseAndPackThrowMapping() throws Exception {
     final InputStream in = getResourceAsInputStream("test.z80");