Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug(#3780): join ShakeMojo and OptimizeMojo #3781

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eo-maven-plugin/src/it/fibonacci/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ SOFTWARE.
<foreignFormat>csv</foreignFormat>
<placed>${project.build.directory}/eo/placed.json</placed>
<placedFormat>json</placedFormat>
<trackOptimizationSteps>true</trackOptimizationSteps>
<trackTransformationSteps>true</trackTransformationSteps>
<generateSodgXmlFiles>true</generateSodgXmlFiles>
<generateGraphFiles>true</generateGraphFiles>
<generateXemblyFiles>true</generateXemblyFiles>
Expand Down
4 changes: 2 additions & 2 deletions eo-maven-plugin/src/it/fibonacci/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ private static boolean online() {
'target/eo/foreign.csv',
'target/generated-sources/EOorg/EOeolang/EOexamples/EOapp.java',
'target/eo/1-parse/org/eolang/examples/app.xmir',
'target/eo/2-optimization-steps/org/eolang/examples/app/00-not-empty-atoms.xml',
'target/eo/2-optimize/org/eolang/examples/app.xmir',
'target/eo/2-shake-steps/org/eolang/examples/app/00-not-empty-atoms.xml',
'target/eo/2-shake/org/eolang/examples/app.xmir',
'target/eo/6-pre/org/eolang/examples/app/01-classes.xml',
'target/eo/7-transpile/org/eolang/examples/app.xmir',
'target/eo/sodg/org/eolang/error.sodg',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* @since 0.1
* @todo #2406:90min Make up with idea how to get rid of duplicate parameters between mojos.
* There's a situation where AssembleMojo owns, creates and executes other mojos,
* like {@link ParseMojo} or {@link OptimizeMojo}. When we configure our compiler via pom.xml maven
* like {@link ParseMojo} or {@link ShakeMojo}. When we configure our compiler via pom.xml maven
* tries to set parameters directly to the calling mojo. That's why we must to have all parameters
* from child mojos in AssembleMojo or {@link SafeMojo} (in order they won't be skipped and lost).
* That causes duplication of parameters between "parent" mojo and "child" mojos.
Expand Down Expand Up @@ -119,8 +119,8 @@ public final class AssembleMojo extends SafeMojo {
* @checkstyle MemberNameCheck (7 lines)
*/
@SuppressWarnings("PMD.LongVariable")
@Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")
private boolean trackOptimizationSteps;
@Parameter(property = "eo.trackTransformationSteps", required = true, defaultValue = "false")
private boolean trackTransformationSteps;

/**
* The Git tag to pull objects from, in objectionary.
Expand Down Expand Up @@ -234,7 +234,6 @@ public void exec() {
int cycle = 0;
final Moja<?>[] mojas = {
new Moja<>(ParseMojo.class),
new Moja<>(OptimizeMojo.class),
new Moja<>(ShakeMojo.class),
new Moja<>(DiscoverMojo.class),
new Moja<>(ProbeMojo.class),
Expand Down
6 changes: 3 additions & 3 deletions eo-maven-plugin/src/main/java/org/eolang/maven/Central.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
*
* @since 0.1
*/
public final class Central implements BiConsumer<Dependency, Path> {
final class Central implements BiConsumer<Dependency, Path> {

/**
* Do nothing.
*/
public static final BiConsumer<Dependency, Path> EMPTY = new BiConsumer<Dependency, Path>() {
static final BiConsumer<Dependency, Path> EMPTY = new BiConsumer<Dependency, Path>() {
@Override
public void accept(final Dependency dependency, final Path path) {
assert dependency != null;
Expand Down Expand Up @@ -77,7 +77,7 @@ public BiConsumer<Dependency, Path> andThen(
* @param sess Session
* @param mgr Manager
*/
public Central(final MavenProject prj, final MavenSession sess,
Central(final MavenProject prj, final MavenSession sess,
final BuildPluginManager mgr) {
this.project = prj;
this.session = sess;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* that we generate as output, for example .java and .sodg files.
* @since 0.27
*/
public final class Disclaimer {
final class Disclaimer {

@Override
public String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static String last(final String input) {

@Override
void exec() throws IOException {
for (final ForeignTojo tojo : this.scopedTojos().withOptimized()) {
for (final ForeignTojo tojo : this.scopedTojos().withShaken()) {
final Path file = tojo.shaken();
final Place place = new Place(
LatexMojo.last(new XMLDocument(file).xpath("/program/@name").get(0))
Expand Down
4 changes: 2 additions & 2 deletions eo-maven-plugin/src/main/java/org/eolang/maven/Moja.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* @param <T> Type of mojo
* @since 0.1
*/
public final class Moja<T extends AbstractMojo> {
final class Moja<T extends AbstractMojo> {

/**
* The type of mojo.
Expand All @@ -62,7 +62,7 @@ public final class Moja<T extends AbstractMojo> {
*
* @param tpe The type
*/
public Moja(final Class<T> tpe) {
Moja(final Class<T> tpe) {
this.type = tpe;
this.attrs = new HashMap<>(0);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.eolang.maven.objectionary;
package org.eolang.maven;

import java.io.IOException;
import org.cactoos.Func;
Expand All @@ -34,7 +34,7 @@
*
* @since 0.1.0
*/
public interface Objectionary {
interface Objectionary {
/**
* Resolve object.
*
Expand Down Expand Up @@ -75,7 +75,7 @@ final class Fake implements Objectionary {
/**
* Ctor.
*/
public Fake() {
Fake() {
this(
s -> new InputOf(
String.join(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.eolang.maven.objectionary;
package org.eolang.maven;

import com.jcabi.aspects.RetryOnFailure;
import java.net.URL;
Expand Down
Loading
Loading