refactoring

Author: raydac

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

@@ -51,27 +51,13 @@ public static <T extends AccessibleObject> T makeAccessible(final T obj) {
    * @param klazz class to be instantiated, must not be null
    * @param <T>   type of the class
    * @return instance of class, must not be null
+   * @throws RuntimeException if can't create instance for an error
    */
   public static <T> T newInstance(final Class<T> klazz) {
     try {
       return klazz.getConstructor().newInstance();
     } catch (Exception ex) {
-      throw new Error(String.format("Can't create instance of %s for error %s", klazz.getCanonicalName(), ex.getMessage()), ex);
-    }
-  }
-
-  /**
-   * Find class for name and make an instance through call of the default constructor.
-   *
-   * @param className the class name to be instantiated, must not be null
-   * @return new instance of the class, must not be null
-   * @throws Error if it is impossible to build instance for an exception
-   */
-  public static Object newInstanceForClassName(final String className) {
-    try {
-      return newInstance(Class.forName(className));
-    } catch (Exception ex) {
-      throw new Error(String.format("Can't create instance of %s for error %s", className, ex.getMessage()), ex);
+      throw new RuntimeException(String.format("Can't create instance of %s for error %s", klazz, ex.getMessage()), ex);
     }
   }
 

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

@@ -24,14 +24,14 @@
 import com.igormaznitsa.jbbp.io.JBBPBitOrder;
 import com.igormaznitsa.jbbp.mapper.JBBPMapper;
 import com.igormaznitsa.jbbp.model.JBBPAbstractField;
-import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJava6ConverterTest;
+import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class JBBPToJBBPToJavaConverterCompilationTest extends AbstractJBBPToJava6ConverterTest {
+class JBBPToJBBPToJavaConverterCompilationTest extends AbstractJBBPToJavaConverterTest {
 
   private static String makeSources(
       final JBBPParser parser,

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJBBPToJavaConverterCompilationTest.java

@@ -18,7 +18,7 @@
 
 import com.igormaznitsa.jbbp.JBBPParser;
 import com.igormaznitsa.jbbp.io.JBBPBitInputStream;
-import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJava6ConverterTest;
+import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import com.igormaznitsa.jbbp.utils.TargetSources;
 import org.junit.jupiter.api.Test;
 
@@ -30,12 +30,12 @@
 import static com.igormaznitsa.jbbp.TestUtils.getField;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class JBBPToJBBPToJavaConverterExpressionTest extends AbstractJBBPToJava6ConverterTest {
+public class JBBPToJBBPToJavaConverterExpressionTest extends AbstractJBBPToJavaConverterTest {
 
   private final JBBPBitInputStream UNLIMITED_STREAM = new JBBPBitInputStream(new InputStream() {
     @Override
     public int read() throws IOException {
-      return RND.nextInt();
+      return testRandomGen.nextInt();
     }
   });
 

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJBBPToJavaConverterExpressionTest.java

@@ -28,7 +28,7 @@
 import com.igormaznitsa.jbbp.model.JBBPAbstractField;
 import com.igormaznitsa.jbbp.model.JBBPFieldArrayInt;
 import com.igormaznitsa.jbbp.model.JBBPFieldInt;
-import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJava6ConverterTest;
+import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import com.igormaznitsa.jbbp.utils.ReflectUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
@@ -46,7 +46,7 @@
 /**
  * Test reading writing with converted classes from parser.
  */
-public class JBBPToJavaConverterReadWriteTest extends AbstractJBBPToJava6ConverterTest {
+public class JBBPToJavaConverterReadWriteTest extends AbstractJBBPToJavaConverterTest {
 
   private byte[] loadResource(final String name) throws Exception {
     try(final InputStream result = this.getClass().getClassLoader().getResourceAsStream("com/igormaznitsa/jbbp/it/" + name)){
@@ -314,7 +314,7 @@ public void testReadWite_BitArrayWholeStream() throws Exception {
     assertNull(getField(instance, "bitarray", byte[].class), "by default must be null");
 
     final byte[] etalon = new byte[1024];
-    RND.nextBytes(etalon);
+    testRandomGen.nextBytes(etalon);
 
     callRead(instance, etalon.clone());
 
@@ -720,7 +720,7 @@ public JBBPAbstractField readCustomFieldType(JBBPBitInputStream in, JBBPBitOrder
         + "}"));
 
     final byte[] etalonArray = new byte[6 + (0x7B + 0x1CB) * 3 + 112 * 3];
-    RND.nextBytes(etalonArray);
+    testRandomGen.nextBytes(etalonArray);
     etalonArray[0] = 0x00;
     etalonArray[1] = 0x00;
     etalonArray[2] = (byte) 0x7B;
@@ -844,7 +844,7 @@ public void testReadWrite_NamedExternalFieldInExpression() throws Exception {
 
     final byte[] array = new byte[77];
 
-    RND.nextBytes(array);
+    testRandomGen.nextBytes(array);
     final JBBPBitInputStream in = new JBBPBitInputStream(new ByteArrayInputStream(array.clone()));
 
     callRead(klazz, in);

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJavaConverterReadWriteTest.java

@@ -17,7 +17,7 @@
 package com.igormaznitsa.jbbp.compiler.conversion;
 
 import com.igormaznitsa.jbbp.JBBPParser;
-import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJava6ConverterTest;
+import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import org.junit.jupiter.api.Test;
 
 import java.io.EOFException;
@@ -29,7 +29,7 @@
 /**
  * Test parser flags for converted sources.
  */
-public class ParserToJBBPToJavaClassConverterJBBPFlagsTest extends AbstractJBBPToJava6ConverterTest {
+public class ParserToJBBPToJavaClassConverterJBBPFlagsTest extends AbstractJBBPToJavaConverterTest {
 
   @Test
   public void testFlag_SkipRemainingFieldsIfEOF() throws Exception {

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/ParserToJBBPToJavaClassConverterJBBPFlagsTest.java

@@ -2,7 +2,7 @@
 
 import com.igormaznitsa.jbbp.io.JBBPBitNumber;
 import com.igormaznitsa.jbbp.io.JBBPByteOrder;
-import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJava6ConverterTest;
+import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import com.igormaznitsa.jbbp.utils.JBBPDslBuilder;
 import org.junit.jupiter.api.Test;
 
@@ -13,7 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class RandomAutoTest extends AbstractJBBPToJava6ConverterTest {
+public class RandomAutoTest extends AbstractJBBPToJavaConverterTest {
 
   private final Random RND = new Random(12345);
 

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/RandomAutoTest.java

@@ -52,12 +52,12 @@
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public abstract class AbstractJBBPToJava6ConverterTest {
+public abstract class AbstractJBBPToJavaConverterTest {
 
   protected static final String PACKAGE_NAME = "com.igormaznitsa.test";
   protected static final String CLASS_NAME = "TestClass";
   protected static TemporaryFolder tempFolder = new TemporaryFolder();
-  protected final Random RND = new Random(123456);
+  protected final Random testRandomGen = new Random(123456);
 
   protected boolean printGeneratedClassText = false;