refactoring

Author: raydac

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/test/java/com/igormaznitsa/jbbp/plugin/common/converters/JavaConverterTest.java

@@ -0,0 +1,47 @@
+package com.igormaznitsa.jbbp.plugin.common.converters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+import java.io.File;
+import org.junit.jupiter.api.Test;
+
+class JavaConverterTest {
+
+  @Test
+  void testTranslateParameters() {
+    final JBBPScriptTranslator.Parameters parameters = new JBBPScriptTranslator.Parameters();
+
+    assertTrue(parameters.setAddNewInstanceMethods(true).isAddNewInstanceMethods());
+    assertFalse(parameters.setAddNewInstanceMethods(false).isAddNewInstanceMethods());
+
+    assertTrue(parameters.setAddBinAnnotations(true).isAddBinAnnotations());
+    assertFalse(parameters.setAddBinAnnotations(false).isAddBinAnnotations());
+
+    assertTrue(parameters.setAddGettersSetters(true).isAddGettersSetters());
+    assertFalse(parameters.setAddGettersSetters(false).isAddGettersSetters());
+
+    assertTrue(parameters.setDisableGenerateFields(true).isDisableGenerateFields());
+    assertFalse(parameters.setDisableGenerateFields(false).isDisableGenerateFields());
+
+    assertTrue(parameters.setDoAbstract(true).isDoAbstract());
+    assertFalse(parameters.setDoAbstract(false).isDoAbstract());
+
+    assertTrue(parameters.setDoInternalClassesNonStatic(true).isDoInternalClassesNonStatic());
+    assertFalse(parameters.setDoInternalClassesNonStatic(false).isDoInternalClassesNonStatic());
+
+    assertEquals(new File("some_test"), parameters.setOutputDir(new File("some_test")).getOutputDir());
+    assertEquals(new File("some_test.script"), parameters.setScriptFile(new File("some_test.script")).getScriptFile());
+    assertEquals("some.test.package", parameters.setPackageName("some.test.package").getPackageName());
+    assertEquals("bit a;", parameters.setScriptText("bit a;").getScriptText());
+    assertEquals("SomeSuperClass", parameters.setSuperClass("SomeSuperClass").getSuperClass());
+    assertEquals(1234, parameters.setParserFlags(1234).getParserFlags());
+    assertEquals("UTF-8", parameters.setEncodingIn("UTF-8").getEncodingIn());
+    assertEquals("UTF-8", parameters.setEncodingOut("UTF-8").getEncodingOut());
+
+    parameters.setScriptFile(null);
+  }
+
+}

jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JBBPScriptTranslator.java

@@ -34,7 +34,7 @@ public interface JBBPScriptTranslator {
    *
    * @since 1.3.0
    */
-  final class Parameters {
+  public final class Parameters {
     /**
      * Map of interface names to be implemented by subclasses.
      */
@@ -63,7 +63,16 @@ final class Parameters {
      * Super class for main class.
      */
     @Nullable
-    protected String superClass = null;
+    private String superClass = null;
+
+    /**
+     * Destination file name.
+     *
+     * @since 2.0.0
+     */
+    @Nullable
+    private String destFileName = null;
+
     /**
      * Processor for custom types.
      */
@@ -88,6 +97,12 @@ final class Parameters {
      */
     @Nullable
     private File scriptFile = null;
+    /**
+     * Script text, it will be used only if {@link #scriptFile} is null
+     *
+     * @since 2.0.0
+     */
+    private String scriptText = null;
     /**
      * Package name for main class.
      */
@@ -162,6 +177,17 @@ public Parameters setAddGettersSetters(final boolean value) {
       return this;
     }
 
+    @Nullable
+    public String getDestFileName() {
+      return this.destFileName;
+    }
+
+    @Nonnull
+    public Parameters setDestFileName(@Nullable final String name) {
+      this.destFileName = name;
+      return this;
+    }
+
     public boolean isDisableGenerateFields() {
       return this.disableGenerateFields;
     }
@@ -269,14 +295,25 @@ public Parameters setOutputDir(@Nullable final File dir) {
       return this;
     }
 
-    @Nonnull
+    @Nullable
     public File getScriptFile() {
-      return Assertions.assertNotNull(this.scriptFile);
+      return this.scriptFile;
+    }
+
+    @Nonnull
+    public Parameters setScriptFile(@Nullable final File file) {
+      this.scriptFile = file;
+      return this;
+    }
+
+    @Nullable
+    public String getScriptText() {
+      return this.scriptText;
     }
 
     @Nonnull
-    public Parameters setScriptFile(@Nonnull final File file) {
-      this.scriptFile = Assertions.assertNotNull(file);
+    public Parameters setScriptText(@Nonnull final String text) {
+      this.scriptText = Assertions.assertNotNull(text);
       return this;
     }
 
@@ -343,5 +380,9 @@ public Parameters assertAllOk() {
       return this;
     }
 
+    @Nullable
+    public String getSuperClass() {
+      return this.superClass;
+    }
   }
 }

jbbp-plugins/jbbp-plugin-common/src/main/java/com/igormaznitsa/jbbp/plugin/common/converters/JavaConverter.java

@@ -21,10 +21,16 @@ public class JavaConverter implements JBBPScriptTranslator {
   @Override
   @Nonnull
   public Set<File> translate(@Nonnull final Parameters parameters, final boolean dryRun) throws IOException {
-    final File scriptToProcess = Assertions.assertNotNull(parameters.getScriptFile());
-
-    final String text = FileUtils.readFileToString(scriptToProcess, parameters.getEncodingIn());
-    final String rawFileName = FilenameUtils.getBaseName(scriptToProcess.getName());
+    final String text;
+    final String rawFileName;
+    if (parameters.getScriptFile() == null) {
+      rawFileName = parameters.getDestFileName() == null ? "JbbpNoName" : parameters.getDestFileName();
+      text = Assertions.assertNotNull("Script file is null, expected script text", parameters.getScriptText());
+    } else {
+      final File scriptToProcess = parameters.getScriptFile();
+      rawFileName = FilenameUtils.getBaseName(scriptToProcess.getName());
+      text = FileUtils.readFileToString(scriptToProcess, parameters.getEncodingIn());
+    }
     final String className = CommonUtils.extractClassName(rawFileName);
     final String packageName = parameters.getPackageName() == null ? CommonUtils.extractPackageName(rawFileName) : parameters.getPackageName();
 
@@ -49,7 +55,7 @@ public Set<File> translate(@Nonnull final Parameters parameters, final boolean d
           .setDoMainClassAbstract(parameters.isDoAbstract())
           .setMainClassImplements(implementsSorted)
           .setParserFlags(parameters.getParserFlags())
-          .setSuperClass(parameters.superClass);
+          .setSuperClass(parameters.getSuperClass());
 
       if (parameters.isAddBinAnnotations()) {
         builder.addBinAnnotations();
@@ -66,7 +72,7 @@ public Set<File> translate(@Nonnull final Parameters parameters, final boolean d
       if (parameters.isDisableGenerateFields()) {
         builder.disableGenerateFields();
       }
-      
+
       FileUtils.write(resultJavaFile, builder.build().convert(), parameters.getEncodingOut());
     }
     return resultFiles;