#358 compiled

objectionary · Oct 7, 2021 · 258b246 · 258b246
1 parent 3cd1275
commit 258b246
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 215 deletions.
diff --git a/eo-maven-plugin/src/it/fibonacci/pom.xml b/eo-maven-plugin/src/it/fibonacci/pom.xml
@@ -46,6 +46,7 @@ SOFTWARE.
             <goals>
               <goal>register</goal>
               <goal>assemble</goal>
+              <goal>transpile</goal>
               <goal>copy-sources</goal>
               <goal>prepack</goal>
             </goals>

diff --git a/eo-maven-plugin/src/it/fibonacci/verify.groovy b/eo-maven-plugin/src/it/fibonacci/verify.groovy
@@ -22,12 +22,14 @@
  * SOFTWARE.
  */
 
+assert new File(basedir, 'target/eo-foreign.csv').exists()
+assert new File(basedir, 'target/eo-resolved.csv').exists()
+
 assert new File(basedir, 'target/generated-sources/EOorg/EOeolang/EOexamples/EOapp.java').exists()
 assert new File(basedir, 'target/eo/01-parse/org/eolang/examples/app.eo.xml').exists()
-assert new File(basedir, 'target/eo/02-steps/org/eolang/examples/app.eo.xml').exists()
+assert new File(basedir, 'target/eo/02-steps/org/eolang/examples/app/00-not-empty-atoms.xml').exists()
 assert new File(basedir, 'target/eo/03-optimize/org/eolang/examples/app.eo.xml').exists()
 assert new File(basedir, 'target/eo/04-pull/org/eolang/array.eo').exists()
-assert new File(basedir, 'target/eo/05-pre/org/eolang/examples/app.eo.xml').exists()
+assert new File(basedir, 'target/eo/05-pre/org/eolang/examples/app/00-pre-classes.xml').exists()
 assert new File(basedir, 'target/eo/06-transpile/org/eolang/examples/app.eo.xml').exists()
 assert new File(basedir, 'target/classes/EOorg/EOeolang/EOexamples/EOapp.class').exists()
-assert new File(basedir, 'target/eo-protocols/org/eolang/array.log').exists()
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java
@@ -26,13 +26,9 @@
 import com.jcabi.log.Logger;
 import java.io.File;
 import java.io.IOException;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.BuildPluginManager;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
 import org.cactoos.Func;
 import org.cactoos.Input;
 import org.eolang.tojos.MonoTojos;
@@ -51,34 +47,6 @@
 )
 public final class AssembleMojo extends SafeMojo {
 
-    /**
-     * Maven project.
-     */
-    @Parameter(defaultValue = "${project}", readonly = true)
-    private MavenProject project;
-
-    /**
-     * Maven session.
-     */
-    @Parameter(defaultValue = "${project}", readonly = true)
-    private MavenSession session;
-
-    /**
-     * Maven plugin manager.
-     */
-    @Component
-    private BuildPluginManager manager;
-
-    /**
-     * The target folder.
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/eo"
-    )
-    private File targetDir;
-
     /**
      * Output.
      * @checkstyle MemberNameCheck (7 lines)
@@ -89,16 +57,6 @@ public final class AssembleMojo extends SafeMojo {
     )
     private File outputDir;
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     /**
      * The objectionary.
      */

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java
@@ -26,7 +26,6 @@
 import com.jcabi.log.Logger;
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -35,7 +34,6 @@
 import java.util.HashSet;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.cactoos.iterable.Filtered;
 import org.cactoos.list.ListOf;
 import org.cactoos.list.Mapped;
@@ -56,16 +54,6 @@
 )
 public final class DiscoverMojo extends SafeMojo {
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     @Override
     public void exec() throws IOException {
         final Tojos tojos = new MonoTojos(this.foreign);

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java
@@ -26,7 +26,6 @@
 import com.jcabi.log.Logger;
 import com.jcabi.xml.XMLDocument;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -35,7 +34,6 @@
 import java.util.Collection;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.cactoos.io.OutputTo;
 import org.cactoos.list.ListOf;
 import org.eolang.parser.Xsline;
@@ -66,26 +64,6 @@ public final class OptimizeMojo extends SafeMojo {
      */
     public static final String DIR = "03-optimize";
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
-    /**
-     * From directory.
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/eo"
-    )
-    private File targetDir;
-
     @Override
     public void exec() throws IOException {
         final Tojos tojos = new MonoTojos(this.foreign);

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ParseMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ParseMojo.java
@@ -25,14 +25,12 @@
 
 import com.jcabi.log.Logger;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.cactoos.io.InputOf;
 import org.cactoos.io.OutputTo;
@@ -66,26 +64,6 @@ public final class ParseMojo extends SafeMojo {
      */
     public static final String DIR = "01-parse";
 
-    /**
-     * Target directory.
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/eo"
-    )
-    private File targetDir;
-
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     @Override
     public void exec() throws IOException {
         final Tojos tojos = new MonoTojos(this.foreign);

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java
@@ -24,7 +24,6 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -56,17 +55,6 @@ public final class PullMojo extends SafeMojo {
      */
     public static final String DIR = "04-pull";
 
-    /**
-     * Where we have .eo.xml files just parsed (we process new .eo
-     * files right here too, and parse them here too).
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/eo"
-    )
-    private File targetDir;
-
     /**
      * Pull again even if the .eo file is already present?
      * @checkstyle MemberNameCheck (7 lines)
@@ -75,16 +63,6 @@ public final class PullMojo extends SafeMojo {
     @Parameter(required = true, defaultValue = "false")
     private boolean overWrite;
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     /**
      * The objectionary.
      */

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/RegisterMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/RegisterMojo.java
@@ -63,16 +63,6 @@ public final class RegisterMojo extends SafeMojo {
     )
     private File sourcesDir;
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     /**
      * List of inclusion GLOB filters for finding EO files.
      */

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java
@@ -35,15 +35,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
 import org.cactoos.iterable.Mapped;
 import org.eolang.tojos.MonoTojos;
 import org.eolang.tojos.Tojo;
@@ -68,24 +64,6 @@
 )
 public final class ResolveMojo extends SafeMojo {
 
-    /**
-     * Maven project.
-     */
-    @Parameter(defaultValue = "${project}", readonly = true)
-    private MavenProject project;
-
-    /**
-     * Maven session.
-     */
-    @Parameter(defaultValue = "${project}", readonly = true)
-    private MavenSession session;
-
-    /**
-     * Maven plugin manager.
-     */
-    @Component
-    private BuildPluginManager manager;
-
     /**
      * Output.
      * @checkstyle MemberNameCheck (7 lines)
@@ -96,16 +74,6 @@ public final class ResolveMojo extends SafeMojo {
     )
     private File outputDir;
 
-    /**
-     * File with foreign "file objects".
-     * @checkstyle MemberNameCheck (7 lines)
-     */
-    @Parameter(
-        required = true,
-        defaultValue = "${project.build.directory}/foreign.csv"
-    )
-    private File foreign;
-
     /**
      * The path to a text file where paths of all added
      * .class (and maybe others) files are placed.
@@ -305,7 +273,6 @@ private Optional<Dependency> artifact(final Path file) throws IOException {
             dependency.setArtifactId(parts[1]);
             dependency.setVersion(parts[2]);
             dependency.setClassifier("");
-            dependency.setType("jar");
             dependency.setScope("transpile");
             dep = Optional.of(dependency);
         }

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java
@@ -23,9 +23,15 @@
  */
 package org.eolang.maven;
 
+import java.io.File;
 import java.io.IOException;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
 import org.slf4j.impl.StaticLoggerBinder;
 
 /**
@@ -35,6 +41,38 @@
  */
 abstract class SafeMojo extends AbstractMojo {
 
+    /**
+     * Maven project.
+     */
+    @Parameter(defaultValue = "${project}", readonly = true)
+    protected MavenProject project;
+
+    /**
+     * Maven session.
+     */
+    @Parameter(defaultValue = "${session}", readonly = true)
+    protected MavenSession session;
+
+    /**
+     * Maven plugin manager.
+     */
+    @Component
+    protected BuildPluginManager manager;
+
+    /**
+     * File with foreign "tojos".
+     * @checkstyle MemberNameCheck (7 lines)
+     */
+    @Parameter(required = true, defaultValue = "${project.build.directory}/eo-foreign.csv")
+    protected File foreign;
+
+    /**
+     * Target directory.
+     * @checkstyle MemberNameCheck (7 lines)
+     */
+    @Parameter(required = true, defaultValue = "${project.build.directory}/eo")
+    protected File targetDir;
+
     /**
      * Exec it.
      * @throws IOException If fails