renaming, added tests

Author: raydac

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

@@ -19,7 +19,7 @@
 import com.igormaznitsa.jbbp.compiler.JBBPCompiledBlock;
 import com.igormaznitsa.jbbp.compiler.JBBPCompiler;
 import com.igormaznitsa.jbbp.compiler.JBBPNamedFieldInfo;
-import com.igormaznitsa.jbbp.compiler.conversion.JBBPToJava6Converter;
+import com.igormaznitsa.jbbp.compiler.conversion.JBBPToJavaConverter;
 import com.igormaznitsa.jbbp.compiler.tokenizer.JBBPFieldTypeParameterContainer;
 import com.igormaznitsa.jbbp.compiler.varlen.JBBPIntegerValueEvaluator;
 import com.igormaznitsa.jbbp.exceptions.JBBPParsingException;
@@ -712,8 +712,8 @@ public JBBPCompiledBlock getCompiledBlock() {
    * @param name   name of result, depends on target, must not be null, for instance class name (example 'com.test.jbbp.Parser')
    * @return list of source items generated during operation, must not be null and must not be empty
    * @throws IllegalArgumentException if target is unsupported
-   * @see JBBPToJava6Converter
-   * @see JBBPToJava6Converter.Builder
+   * @see JBBPToJavaConverter
+   * @see JBBPToJavaConverter.Builder
    * @since 1.3.0
    */
   public List<ResultSrcItem> convertToSrc(final TargetSources target, final String name) {
@@ -724,7 +724,7 @@ public List<ResultSrcItem> convertToSrc(final TargetSources target, final String
       metadata.setProperty("script", this.compiledBlock.getSource());
       metadata.setProperty("name", name);
       metadata.setProperty("target", target.name());
-      metadata.setProperty("converter", JBBPToJava6Converter.class.getCanonicalName());
+      metadata.setProperty("converter", JBBPToJavaConverter.class.getCanonicalName());
 
       final int nameStart = name.lastIndexOf('.');
       final String packageName;
@@ -737,7 +737,7 @@ public List<ResultSrcItem> convertToSrc(final TargetSources target, final String
         className = name.substring(nameStart + 1);
       }
 
-      final String resultSources = JBBPToJava6Converter.makeBuilder(this).setMainClassPackage(packageName).setMainClassName(className).build().convert();
+      final String resultSources = JBBPToJavaConverter.makeBuilder(this).setMainClassPackage(packageName).setMainClassName(className).build().convert();
       final Map<String, String> resultMap = Collections.singletonMap(name.replace('.', '/') + ".java", resultSources);
 
       return Collections.singletonList(new ResultSrcItem() {

…ler/conversion/JBBPToJava6Converter.java …iler/conversion/JBBPToJavaConverter.javajbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6Converter.java renamed to jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJavaConverter.java jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6Converter.java renamed to jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJavaConverter.java

@@ -47,7 +47,7 @@
  * @since 1.3.0
  */
 @SuppressWarnings("SpellCheckingInspection")
-public final class JBBPToJava6Converter extends CompiledBlockVisitor {
+public final class JBBPToJavaConverter extends CompiledBlockVisitor {
 
   private static final int FLAG_DETECTED_CUSTOM_FIELDS = 1;
   private static final int FLAG_DETECTED_EXTERNAL_FIELDS = 2;
@@ -179,7 +179,7 @@ public final class JBBPToJava6Converter extends CompiledBlockVisitor {
    *
    * @param builder a builder instance, must not be null
    */
-  private JBBPToJava6Converter(final Builder builder) {
+  private JBBPToJavaConverter(final Builder builder) {
     super(builder.parserFlags, builder.srcParser.getCompiledBlock());
     this.builder = builder;
   }
@@ -201,7 +201,7 @@ public static Builder makeBuilder(final JBBPParser parser) {
    * @return generated class with needed parameters as text, must not be null.
    */
   public String convert() {
-    return ((JBBPToJava6Converter) this.visit()).getResult();
+    return ((JBBPToJavaConverter) this.visit()).getResult();
   }
 
   private void registerNamedField(final JBBPNamedFieldInfo fieldInfo, final FieldType fieldType) {
@@ -324,7 +324,7 @@ public void visitEnd() {
     final Struct rootStruct = this.structStack.get(0);
 
     if (this.builder.genNewInstance) {
-      rootStruct.misc.println(String.format("public Object %s(Class aClass) {", JBBPMapper.MAKE_CLASS_INSTANCE_METHOD_NAME));
+      rootStruct.misc.println(String.format("public Object %s(Class<?> aClass) {", JBBPMapper.MAKE_CLASS_INSTANCE_METHOD_NAME));
       rootStruct.misc.incIndent();
 
       for (final Struct c : rootStruct.children) {
@@ -1515,12 +1515,12 @@ public Builder disableGenerateFields() {
      *
      * @return a converter instance.
      */
-    public JBBPToJava6Converter build() {
+    public JBBPToJavaConverter build() {
       this.lockBuilder = true;
       if (this.mainClassName == null) {
         throw new NullPointerException("Class name must not be null");
       }
-      return new JBBPToJava6Converter(this);
+      return new JBBPToJavaConverter(this);
     }
   }