renamed constant JAVA_1_6 to JAVA

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/JBBPParser.java

@@ -16,6 +16,9 @@
 
 package com.igormaznitsa.jbbp;
 
+import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_FIELD_EMPTY;
+
+
 import com.igormaznitsa.jbbp.compiler.JBBPCompiledBlock;
 import com.igormaznitsa.jbbp.compiler.JBBPCompiler;
 import com.igormaznitsa.jbbp.compiler.JBBPNamedFieldInfo;
@@ -57,7 +60,6 @@
 import com.igormaznitsa.jbbp.utils.JBBPIntCounter;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import com.igormaznitsa.jbbp.utils.TargetSources;
-
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
@@ -68,8 +70,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_FIELD_EMPTY;
-
 /**
  * the Main class allows a user to parse a binary stream or block for predefined
  * and precompiled script.
@@ -719,7 +719,7 @@ public JBBPCompiledBlock getCompiledBlock() {
   public List<ResultSrcItem> convertToSrc(final TargetSources target, final String name) {
     JBBPUtils.assertNotNull(name, "Name must not be null");
 
-    if (target == TargetSources.JAVA_1_6) {
+    if (target == TargetSources.JAVA) {
       final Properties metadata = new Properties();
       metadata.setProperty("script", this.compiledBlock.getSource());
       metadata.setProperty("name", name);

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

@@ -24,7 +24,7 @@
  */
 public enum TargetSources {
   /**
-   * Java 1.6 sources.
+   * Generate Java sources.
    */
-  JAVA_1_6
+  JAVA
 }

jbbp/src/test/java/com/igormaznitsa/jbbp/JBBPParserTest.java

@@ -16,6 +16,16 @@
 
 package com.igormaznitsa.jbbp;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+
 import com.igormaznitsa.jbbp.compiler.JBBPNamedFieldInfo;
 import com.igormaznitsa.jbbp.exceptions.JBBPCompilationException;
 import com.igormaznitsa.jbbp.exceptions.JBBPParsingException;
@@ -49,15 +59,11 @@
 import com.igormaznitsa.jbbp.model.JBBPFieldUShort;
 import com.igormaznitsa.jbbp.utils.JBBPIntCounter;
 import com.igormaznitsa.jbbp.utils.TargetSources;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.function.Executable;
-
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JBBPParserTest {
 
@@ -2051,7 +2057,7 @@ public void testParse_NoErrorForIgnoreRemainingFieldsFlag() throws Exception {
   public void testConvertToSrc_Java16_NamedPackage() throws Exception {
     final JBBPParser parser = JBBPParser.prepare("byte a;");
 
-    final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "some.package.SomeClass");
+    final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA, "some.package.SomeClass");
 
     assertEquals(1, src.size());
     assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));
@@ -2062,7 +2068,7 @@ public void testConvertToSrc_Java16_NamedPackage() throws Exception {
   public void testConvertToSrc_Java16_DefaultPackage() throws Exception {
     final JBBPParser parser = JBBPParser.prepare("byte a;");
 
-    final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "SomeClass");
+    final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA, "SomeClass");
 
     assertEquals(1, src.size());
     assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));

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

@@ -16,19 +16,21 @@
 
 package com.igormaznitsa.jbbp.compiler.conversion;
 
+import static com.igormaznitsa.jbbp.TestUtils.getField;
+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.JBBPBitInputStream;
 import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
 import com.igormaznitsa.jbbp.utils.TargetSources;
-import org.junit.jupiter.api.Test;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Random;
-
-import static com.igormaznitsa.jbbp.TestUtils.getField;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JBBPToJBBPToJavaConverterExpressionTest extends AbstractJBBPToJavaConverterTest {
 
@@ -49,7 +51,7 @@ private void assertExpression(final int etalonValue, final String expression) th
     final int detectedlength = getField(obj, "data", byte[].class).length;
 
     if (etalonValue != detectedlength) {
-      System.err.println(JBBPParser.prepare(String.format("byte [%s] data;", expression)).convertToSrc(TargetSources.JAVA_1_6, PACKAGE_NAME + "." + CLASS_NAME).get(0).getResult().values().iterator().next());
+      System.err.println(JBBPParser.prepare(String.format("byte [%s] data;", expression)).convertToSrc(TargetSources.JAVA, PACKAGE_NAME + "." + CLASS_NAME).get(0).getResult().values().iterator().next());
       fail(etalonValue + "!=" + detectedlength);
     }
   }

jbbp/src/test/java/com/igormaznitsa/jbbp/testaux/AbstractJBBPToJavaConverterTest.java

@@ -24,16 +24,6 @@
 import com.igormaznitsa.jbbp.io.JBBPBitOutputStream;
 import com.igormaznitsa.jbbp.utils.ReflectUtils;
 import com.igormaznitsa.jbbp.utils.TargetSources;
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -51,6 +41,15 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 
 public abstract class AbstractJBBPToJavaConverterTest {
 
@@ -150,7 +149,7 @@ protected Object compileAndMakeInstance(final String instanceClassName, final St
 
   protected Object compileAndMakeInstance(final String instanceClassName, final String script, final int parserFlags, final JBBPCustomFieldTypeProcessor customFieldProcessor, final JavaClassContent... extraClasses) throws Exception {
     final List<JavaClassContent> klazzes = new ArrayList<>(Arrays.asList(extraClasses));
-    final JavaClassContent klazzContent = new JavaClassContent(PACKAGE_NAME + '.' + CLASS_NAME, JBBPParser.prepare(script, JBBPBitOrder.LSB0, customFieldProcessor, parserFlags).convertToSrc(TargetSources.JAVA_1_6, PACKAGE_NAME + "." + CLASS_NAME).get(0).getResult().values().iterator().next());
+    final JavaClassContent klazzContent = new JavaClassContent(PACKAGE_NAME + '.' + CLASS_NAME, JBBPParser.prepare(script, JBBPBitOrder.LSB0, customFieldProcessor, parserFlags).convertToSrc(TargetSources.JAVA, PACKAGE_NAME + "." + CLASS_NAME).get(0).getResult().values().iterator().next());
     if (this.printGeneratedClassText) {
       System.out.println(klazzContent.classText);
     }