Skip to content

Commit 2ccda6e

Browse files
raydacraydac
committed
renamed constant JAVA_1_6 to JAVA
1 parent e98ecf9 commit 2ccda6e

5 files changed

Lines changed: 37 additions & 30 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.igormaznitsa.jbbp;
1818

19+
import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_FIELD_EMPTY;
20+
21+
1922
import com.igormaznitsa.jbbp.compiler.JBBPCompiledBlock;
2023
import com.igormaznitsa.jbbp.compiler.JBBPCompiler;
2124
import com.igormaznitsa.jbbp.compiler.JBBPNamedFieldInfo;
@@ -57,7 +60,6 @@
5760
import com.igormaznitsa.jbbp.utils.JBBPIntCounter;
5861
import com.igormaznitsa.jbbp.utils.JBBPUtils;
5962
import com.igormaznitsa.jbbp.utils.TargetSources;
60-
6163
import java.io.ByteArrayInputStream;
6264
import java.io.EOFException;
6365
import java.io.IOException;
@@ -68,8 +70,6 @@
6870
import java.util.Map;
6971
import java.util.Properties;
7072

71-
import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_FIELD_EMPTY;
72-
7373
/**
7474
* the Main class allows a user to parse a binary stream or block for predefined
7575
* and precompiled script.
@@ -719,7 +719,7 @@ public JBBPCompiledBlock getCompiledBlock() {
719719
public List<ResultSrcItem> convertToSrc(final TargetSources target, final String name) {
720720
JBBPUtils.assertNotNull(name, "Name must not be null");
721721

722-
if (target == TargetSources.JAVA_1_6) {
722+
if (target == TargetSources.JAVA) {
723723
final Properties metadata = new Properties();
724724
metadata.setProperty("script", this.compiledBlock.getSource());
725725
metadata.setProperty("name", name);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
public enum TargetSources {
2626
/**
27-
* Java 1.6 sources.
27+
* Generate Java sources.
2828
*/
29-
JAVA_1_6
29+
JAVA
3030
}

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616

1717
package com.igormaznitsa.jbbp;
1818

19+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertNotNull;
23+
import static org.junit.jupiter.api.Assertions.assertNull;
24+
import static org.junit.jupiter.api.Assertions.assertThrows;
25+
import static org.junit.jupiter.api.Assertions.assertTrue;
26+
import static org.junit.jupiter.api.Assertions.fail;
27+
28+
1929
import com.igormaznitsa.jbbp.compiler.JBBPNamedFieldInfo;
2030
import com.igormaznitsa.jbbp.exceptions.JBBPCompilationException;
2131
import com.igormaznitsa.jbbp.exceptions.JBBPParsingException;
@@ -49,15 +59,11 @@
4959
import com.igormaznitsa.jbbp.model.JBBPFieldUShort;
5060
import com.igormaznitsa.jbbp.utils.JBBPIntCounter;
5161
import com.igormaznitsa.jbbp.utils.TargetSources;
52-
import org.junit.jupiter.api.Test;
53-
import org.junit.jupiter.api.function.Executable;
54-
5562
import java.io.ByteArrayInputStream;
5663
import java.io.EOFException;
5764
import java.io.IOException;
5865
import java.util.List;
59-
60-
import static org.junit.jupiter.api.Assertions.*;
66+
import org.junit.jupiter.api.Test;
6167

6268
public class JBBPParserTest {
6369

@@ -2051,7 +2057,7 @@ public void testParse_NoErrorForIgnoreRemainingFieldsFlag() throws Exception {
20512057
public void testConvertToSrc_Java16_NamedPackage() throws Exception {
20522058
final JBBPParser parser = JBBPParser.prepare("byte a;");
20532059

2054-
final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "some.package.SomeClass");
2060+
final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA, "some.package.SomeClass");
20552061

20562062
assertEquals(1, src.size());
20572063
assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));
@@ -2062,7 +2068,7 @@ public void testConvertToSrc_Java16_NamedPackage() throws Exception {
20622068
public void testConvertToSrc_Java16_DefaultPackage() throws Exception {
20632069
final JBBPParser parser = JBBPParser.prepare("byte a;");
20642070

2065-
final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA_1_6, "SomeClass");
2071+
final List<ResultSrcItem> src = parser.convertToSrc(TargetSources.JAVA, "SomeClass");
20662072

20672073
assertEquals(1, src.size());
20682074
assertEquals("byte a;", src.get(0).getMetadata().getProperty("script"));

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@
1616

1717
package com.igormaznitsa.jbbp.compiler.conversion;
1818

19+
import static com.igormaznitsa.jbbp.TestUtils.getField;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.fail;
23+
24+
1925
import com.igormaznitsa.jbbp.JBBPParser;
2026
import com.igormaznitsa.jbbp.io.JBBPBitInputStream;
2127
import com.igormaznitsa.jbbp.testaux.AbstractJBBPToJavaConverterTest;
2228
import com.igormaznitsa.jbbp.utils.TargetSources;
23-
import org.junit.jupiter.api.Test;
24-
2529
import java.io.IOException;
2630
import java.io.InputStream;
2731
import java.lang.reflect.InvocationTargetException;
2832
import java.util.Random;
29-
30-
import static com.igormaznitsa.jbbp.TestUtils.getField;
31-
import static org.junit.jupiter.api.Assertions.*;
33+
import org.junit.jupiter.api.Test;
3234

3335
public class JBBPToJBBPToJavaConverterExpressionTest extends AbstractJBBPToJavaConverterTest {
3436

@@ -49,7 +51,7 @@ private void assertExpression(final int etalonValue, final String expression) th
4951
final int detectedlength = getField(obj, "data", byte[].class).length;
5052

5153
if (etalonValue != detectedlength) {
52-
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());
54+
System.err.println(JBBPParser.prepare(String.format("byte [%s] data;", expression)).convertToSrc(TargetSources.JAVA, PACKAGE_NAME + "." + CLASS_NAME).get(0).getResult().values().iterator().next());
5355
fail(etalonValue + "!=" + detectedlength);
5456
}
5557
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@
2424
import com.igormaznitsa.jbbp.io.JBBPBitOutputStream;
2525
import com.igormaznitsa.jbbp.utils.ReflectUtils;
2626
import com.igormaznitsa.jbbp.utils.TargetSources;
27-
import org.apache.commons.io.FileUtils;
28-
import org.junit.jupiter.api.AfterAll;
29-
import org.junit.jupiter.api.BeforeAll;
30-
31-
import javax.tools.Diagnostic;
32-
import javax.tools.DiagnosticCollector;
33-
import javax.tools.JavaCompiler;
34-
import javax.tools.JavaFileObject;
35-
import javax.tools.StandardJavaFileManager;
36-
import javax.tools.ToolProvider;
3727
import java.io.ByteArrayInputStream;
3828
import java.io.ByteArrayOutputStream;
3929
import java.io.File;
@@ -51,6 +41,15 @@
5141
import java.util.Map;
5242
import java.util.Random;
5343
import java.util.concurrent.atomic.AtomicBoolean;
44+
import javax.tools.Diagnostic;
45+
import javax.tools.DiagnosticCollector;
46+
import javax.tools.JavaCompiler;
47+
import javax.tools.JavaFileObject;
48+
import javax.tools.StandardJavaFileManager;
49+
import javax.tools.ToolProvider;
50+
import org.apache.commons.io.FileUtils;
51+
import org.junit.jupiter.api.AfterAll;
52+
import org.junit.jupiter.api.BeforeAll;
5453

5554
public abstract class AbstractJBBPToJavaConverterTest {
5655

@@ -150,7 +149,7 @@ protected Object compileAndMakeInstance(final String instanceClassName, final St
150149

151150
protected Object compileAndMakeInstance(final String instanceClassName, final String script, final int parserFlags, final JBBPCustomFieldTypeProcessor customFieldProcessor, final JavaClassContent... extraClasses) throws Exception {
152151
final List<JavaClassContent> klazzes = new ArrayList<>(Arrays.asList(extraClasses));
153-
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());
152+
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());
154153
if (this.printGeneratedClassText) {
155154
System.out.println(klazzContent.classText);
156155
}

0 commit comments

Comments
 (0)