From 068c1c26973c861527efbc5e03340294694996c6 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 12 Feb 2025 14:36:24 +0300 Subject: [PATCH 1/4] bug(#3507): fp default --- .../org/eolang/maven/footprint/FpDefault.java | 47 +++++++++---------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java b/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java index c7e6091e2a..a2e277f335 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java @@ -35,7 +35,9 @@ * 2) if target younger than source or does not exist - it will be created and filled up. * It can be created from source, or from global cache if it exists and cacheable and * older than source. - * 3) the cache is updated if it's cacheable AND (it does not exist or if it's younger than source) + * 3) the cache is updated if it's cacheable (it does not exist or if it's younger than source) + * 4) if the semver is "0.0.0" or "SNAPSHOT" ({@link FpIfReleased}) - the cache and target is always + * regenerated *

* *

Excluding any type of errors there are 4 possible scenarios of this {@link Footprint} work: @@ -80,35 +82,28 @@ public FpDefault( final Supplier hash, final Path tail ) { - this(new FpGenerated(content), base, semver, hash, tail); + this(content, semver, hash, new CachePath(base, semver, hash, tail)); } /** * Ctor. - * @param generated Footprint that generates content - * @param base Base cache path - * @param semver Cache version - * @param hash Cache hash - * @param tail Cache tail path + * @param content Function that returns content from source + * @param semver Semver as part of absolute cache path + * @param hash Git hash as part of absolute cache path + * @param cache Lazy cache path */ private FpDefault( - final Footprint generated, - final Path base, + final Func content, final String semver, final Supplier hash, - final Path tail + final Supplier cache ) { - this( - generated, - semver, - hash, - new CachePath(base, semver, hash, tail) - ); + this(new FpUpdateBoth(new FpGenerated(content), cache), semver, hash, cache); } /** * Ctor. - * @param generated Footprint that generates content + * @param generated Footprint that generates content and updates in locally and in cache * @param semver Cache version * @param hash Cache hash * @param cache Lazy cache path @@ -121,18 +116,18 @@ private FpDefault( ) { super( new FpExistedSource( - new FpIfOlder( - new FpIgnore(), - new FpIfReleased( - semver, - hash, + new FpIfReleased( + semver, + hash, + new FpIfOlder( + new FpIgnore(), new FpIfOlder( target -> cache.get(), new FpUpdateFromCache(cache), - new FpUpdateBoth(generated, cache) - ), - generated - ) + generated + ) + ), + generated ) ) ); From dc44c3c9cf1c1a2bcbdc68cef7b98f0b26d713ef Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 12 Feb 2025 15:37:59 +0300 Subject: [PATCH 2/4] bug(#3507): pull and transpile --- .../main/java/org/eolang/maven/PullMojo.java | 37 ++++++++----------- .../java/org/eolang/maven/TranspileMojo.java | 34 ++++++++--------- .../org/eolang/maven/footprint/FpDefault.java | 31 ++++++++++------ 3 files changed, 50 insertions(+), 52 deletions(-) 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 index f0db3e962e..4f1738ddec 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java @@ -172,36 +172,31 @@ private Path pulled(final String object, final Path base, final String hsh) thro return new TextOf(this.objectionary.get(object)).asString(); } ); - return new FpIfTargetExists( + final Footprint both = new FpUpdateBoth(generated, che); + return new FpIfReleased( + this.plugin.getVersion(), + hsh, new FpFork( (src, tgt) -> { - final boolean rewrite = this.overWrite; - if (rewrite) { + if (this.overWrite) { Logger.debug( this, "Pulling sources again since eo.overWrite=TRUE" ); } - return rewrite; + return this.overWrite; }, - new FpIfReleased( - semver, - hsh, - new FpUpdateBoth(generated, che), - generated - ), - new FpIgnore() - ), - new FpIfReleased( - semver, - hsh, + both, new FpIfTargetExists( - tgt -> che.get(), - new FpUpdateFromCache(che), - new FpUpdateBoth(generated, che) - ), - generated - ) + new FpIgnore(), + new FpIfTargetExists( + tgt -> che.get(), + new FpUpdateFromCache(che), + both + ) + ) + ), + generated ).apply(Paths.get(""), target); } } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java index 7a57621620..caa6f1c357 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java @@ -208,7 +208,7 @@ private int transpiled( final AtomicBoolean rewrite = new AtomicBoolean(false); new FpDefault( src -> { - rewrite.set(true); + rewrite.compareAndSet(false, true); return transform.apply(xmir).toString(); }, this.cache.toPath().resolve(TranspileMojo.CACHE), @@ -278,7 +278,10 @@ private int javaGenerated(final boolean rewrite, final Path target, final String return new Joined("", xnav.element("java").text().get()).asString(); } ); - new FpIfTargetExists( + final Footprint both = new FpUpdateBoth(generated, che); + new FpIfReleased( + this.plugin.getVersion(), + hsh, new FpFork( (src, trgt) -> { if (rewrite) { @@ -291,24 +294,17 @@ private int javaGenerated(final boolean rewrite, final Path target, final String } return rewrite; }, - new FpIfReleased( - this.plugin.getVersion(), - hsh, - new FpUpdateBoth(generated, che), - generated - ), - new FpIgnore() - ), - new FpIfReleased( - this.plugin.getVersion(), - hsh, + both, new FpIfTargetExists( - trgt -> che.get(), - new FpUpdateFromCache(che), - new FpUpdateBoth(generated, che) - ), - generated - ) + new FpIgnore(), + new FpIfTargetExists( + trgt -> che.get(), + new FpUpdateFromCache(che), + both + ) + ) + ), + generated ).apply(Paths.get(""), tgt); } return saved.get(); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java b/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java index a2e277f335..2fcc954307 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/footprint/FpDefault.java @@ -36,8 +36,8 @@ * It can be created from source, or from global cache if it exists and cacheable and * older than source. * 3) the cache is updated if it's cacheable (it does not exist or if it's younger than source) - * 4) if the semver is "0.0.0" or "SNAPSHOT" ({@link FpIfReleased}) - the cache and target is always - * regenerated + * 4) if the semver is "0.0.0" or "SNAPSHOT" ({@link FpIfReleased}) - the target is always + * regenerated and cache is not touched at all. *

* *

Excluding any type of errors there are 4 possible scenarios of this {@link Footprint} work: @@ -82,28 +82,35 @@ public FpDefault( final Supplier hash, final Path tail ) { - this(content, semver, hash, new CachePath(base, semver, hash, tail)); + this(new FpGenerated(content), base, semver, hash, tail); } /** * Ctor. - * @param content Function that returns content from source - * @param semver Semver as part of absolute cache path - * @param hash Git hash as part of absolute cache path - * @param cache Lazy cache path + * @param generated Footprint that generates content + * @param base Base cache path + * @param semver Cache version + * @param hash Cache hash + * @param tail Cache tail path */ private FpDefault( - final Func content, + final Footprint generated, + final Path base, final String semver, final Supplier hash, - final Supplier cache + final Path tail ) { - this(new FpUpdateBoth(new FpGenerated(content), cache), semver, hash, cache); + this( + generated, + semver, + hash, + new CachePath(base, semver, hash, tail) + ); } /** * Ctor. - * @param generated Footprint that generates content and updates in locally and in cache + * @param generated Footprint that generates content * @param semver Cache version * @param hash Cache hash * @param cache Lazy cache path @@ -124,7 +131,7 @@ private FpDefault( new FpIfOlder( target -> cache.get(), new FpUpdateFromCache(cache), - generated + new FpUpdateBoth(generated, cache) ) ), generated From 668f6048311baa2a9a6a1257e920e8f91b31c267 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 12 Feb 2025 17:35:26 +0300 Subject: [PATCH 3/4] bug(#3507): dont cache on snapshot --- .../AttributeNotFoundException.java | 6 +- .../org/eolang/maven/{hash => }/ChCached.java | 6 +- .../org/eolang/maven/{hash => }/ChNarrow.java | 6 +- .../eolang/maven/{hash => }/ChPattern.java | 6 +- .../org/eolang/maven/{hash => }/ChRemote.java | 6 +- .../org/eolang/maven/{hash => }/ChText.java | 6 +- .../eolang/maven/{hash => }/CommitHash.java | 10 ++- .../maven/{hash => }/CommitHashesMap.java | 8 +- .../maven/{hash => }/CommitHashesText.java | 2 +- .../maven/{dependencies => }/DcsDefault.java | 18 ++-- .../maven/{dependencies => }/DcsDepgraph.java | 6 +- .../DcsEachWithoutTransitive.java | 8 +- .../maven/{dependencies => }/DcsFake.java | 4 +- .../DcsUniquelyVersioned.java | 6 +- .../{dependencies => }/DcsWithRuntime.java | 8 +- .../{dependencies => }/DcsWithoutRuntime.java | 6 +- .../main/java/org/eolang/maven/LatexMojo.java | 3 +- .../main/java/org/eolang/maven/LintMojo.java | 10 +-- .../main/java/org/eolang/maven/MarkMojo.java | 3 +- .../main/java/org/eolang/maven/OyRemote.java | 1 - .../main/java/org/eolang/maven/ParseMojo.java | 6 +- .../main/java/org/eolang/maven/PlaceMojo.java | 5 +- .../main/java/org/eolang/maven/ProbeMojo.java | 9 +- .../main/java/org/eolang/maven/PullMojo.java | 9 +- .../java/org/eolang/maven/ResolveMojo.java | 6 -- .../main/java/org/eolang/maven/SafeMojo.java | 15 ++-- .../main/java/org/eolang/maven/ShakeMojo.java | 8 +- .../main/java/org/eolang/maven/SodgMojo.java | 5 +- .../ForeignTojo.java => TjForeign.java} | 88 +++++++++---------- .../{tojos/PlacedTojo.java => TjPlaced.java} | 24 ++--- .../ForeignTojos.java => TjsForeign.java} | 38 ++++---- .../PlacedTojos.java => TjsPlaced.java} | 35 ++++---- ...ranspiledTojos.java => TjsTranspiled.java} | 10 +-- .../eolang/maven/{tojos => }/TojoHash.java | 8 +- .../java/org/eolang/maven/TranspileMojo.java | 6 +- .../java/org/eolang/maven/UnplaceMojo.java | 15 ++-- .../maven/dependencies/package-info.java | 28 ------ .../org/eolang/maven/hash/package-info.java | 35 -------- .../org/eolang/maven/tojos/package-info.java | 32 ------- .../eolang/maven/{hash => }/ChCachedTest.java | 3 +- .../eolang/maven/{hash => }/ChNarrowTest.java | 3 +- .../maven/{hash => }/ChPatternTest.java | 3 +- .../eolang/maven/{hash => }/ChRemoteTest.java | 3 +- .../eolang/maven/{hash => }/ChTextTest.java | 3 +- .../maven/{hash => }/CommitHashesMapTest.java | 2 +- .../{hash => }/CommitHashesTextTest.java | 2 +- .../{dependencies => }/DcsDepgraphTest.java | 3 +- .../DcsEachWithoutTransitiveTest.java | 3 +- .../DcsWithRuntimeTest.java | 3 +- .../test/java/org/eolang/maven/FakeMaven.java | 14 ++- .../java/org/eolang/maven/LintMojoTest.java | 3 +- .../java/org/eolang/maven/MarkMojoTest.java | 3 +- .../java/org/eolang/maven/OyRemoteTest.java | 3 - .../java/org/eolang/maven/ParseMojoTest.java | 4 - .../java/org/eolang/maven/ProbeMojoTest.java | 3 - .../java/org/eolang/maven/PullMojoTest.java | 6 -- ...eignTojosTest.java => TjsForeignTest.java} | 45 +++++----- ...dTojosTest.java => TjsTranspiledTest.java} | 11 ++- .../org/eolang/maven/TranspileMojoTest.java | 10 ++- .../org/eolang/maven/UnplaceMojoTest.java | 14 ++- .../maven/dependencies/package-info.java | 29 ------ .../eolang/maven/footprint/FpDefaultTest.java | 4 +- .../org/eolang/maven/hash/package-info.java | 29 ------ .../org/eolang/maven/tojos/package-info.java | 28 ------ 64 files changed, 248 insertions(+), 497 deletions(-) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos => }/AttributeNotFoundException.java (89%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/ChCached.java (92%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/ChNarrow.java (93%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/ChPattern.java (97%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/ChRemote.java (94%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/ChText.java (97%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/CommitHash.java (88%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/CommitHashesMap.java (95%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{hash => }/CommitHashesText.java (98%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsDefault.java (93%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsDepgraph.java (98%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsEachWithoutTransitive.java (94%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsFake.java (97%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsUniquelyVersioned.java (94%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsWithRuntime.java (96%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{dependencies => }/DcsWithoutRuntime.java (90%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos/ForeignTojo.java => TjForeign.java} (69%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos/PlacedTojo.java => TjPlaced.java} (77%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos/ForeignTojos.java => TjsForeign.java} (90%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos/PlacedTojos.java => TjsPlaced.java} (87%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos/TranspiledTojos.java => TjsTranspiled.java} (94%) rename eo-maven-plugin/src/main/java/org/eolang/maven/{tojos => }/TojoHash.java (90%) delete mode 100644 eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/package-info.java delete mode 100644 eo-maven-plugin/src/main/java/org/eolang/maven/hash/package-info.java delete mode 100644 eo-maven-plugin/src/main/java/org/eolang/maven/tojos/package-info.java rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/ChCachedTest.java (96%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/ChNarrowTest.java (97%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/ChPatternTest.java (97%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/ChRemoteTest.java (97%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/ChTextTest.java (98%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/CommitHashesMapTest.java (98%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{hash => }/CommitHashesTextTest.java (98%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{dependencies => }/DcsDepgraphTest.java (97%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{dependencies => }/DcsEachWithoutTransitiveTest.java (97%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{dependencies => }/DcsWithRuntimeTest.java (96%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{tojos/ForeignTojosTest.java => TjsForeignTest.java} (78%) rename eo-maven-plugin/src/test/java/org/eolang/maven/{tojos/TranspiledTojosTest.java => TjsTranspiledTest.java} (95%) delete mode 100644 eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/package-info.java delete mode 100644 eo-maven-plugin/src/test/java/org/eolang/maven/hash/package-info.java delete mode 100644 eo-maven-plugin/src/test/java/org/eolang/maven/tojos/package-info.java diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/AttributeNotFoundException.java b/eo-maven-plugin/src/main/java/org/eolang/maven/AttributeNotFoundException.java similarity index 89% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/AttributeNotFoundException.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/AttributeNotFoundException.java index bc5ecbd3a3..dd4bc49e45 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/AttributeNotFoundException.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/AttributeNotFoundException.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.tojos; +package org.eolang.maven; /** * If the attributes were not found in the Tojo. * @since 0.35.0 */ -public class AttributeNotFoundException extends RuntimeException { +final class AttributeNotFoundException extends RuntimeException { /** * Ctor. * @param attribute The attribute of Tojo. */ - AttributeNotFoundException(final ForeignTojos.Attribute attribute) { + AttributeNotFoundException(final TjsForeign.Attribute attribute) { super( String.format( "There is no '%s' attribute in the tojo", attribute diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChCached.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ChCached.java similarity index 92% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChCached.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/ChCached.java index 195f81631a..eff7eb7d01 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChCached.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ChCached.java @@ -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.hash; +package org.eolang.maven; import org.cactoos.scalar.Sticky; import org.cactoos.scalar.Unchecked; @@ -31,7 +31,7 @@ * * @since 0.28.11 */ -public final class ChCached implements CommitHash { +final class ChCached implements CommitHash { /** * Cache. @@ -43,7 +43,7 @@ public final class ChCached implements CommitHash { * * @param delegate Delegate */ - public ChCached(final CommitHash delegate) { + ChCached(final CommitHash delegate) { this.delegate = new Unchecked<>(new Sticky<>(delegate::value)); } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChNarrow.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ChNarrow.java similarity index 93% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChNarrow.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/ChNarrow.java index a6b9017c74..5bbd08a7ec 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChNarrow.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ChNarrow.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; /** * Short version of hash. * * @since 0.28.11 */ -public final class ChNarrow implements CommitHash { +final class ChNarrow implements CommitHash { /** * Delegate. @@ -40,7 +40,7 @@ public final class ChNarrow implements CommitHash { * * @param full Delegate */ - public ChNarrow(final CommitHash full) { + ChNarrow(final CommitHash full) { this.full = full; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChPattern.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ChPattern.java similarity index 97% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChPattern.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/ChPattern.java index 910ff1b45a..416d86842d 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChPattern.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ChPattern.java @@ -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.hash; +package org.eolang.maven; import java.util.Comparator; import java.util.LinkedList; @@ -41,7 +41,7 @@ * * @since 0.28.11 */ -public final class ChPattern implements CommitHash { +final class ChPattern implements CommitHash { /** * Pattern like *.*.* or 'master'. @@ -59,7 +59,7 @@ public final class ChPattern implements CommitHash { * @param pattern Pattern like *.*.* or 'master'. * @param tag Particular tag to match. */ - public ChPattern( + ChPattern( final String pattern, final String tag ) { diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChRemote.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ChRemote.java similarity index 94% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChRemote.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/ChRemote.java index ff3b2676a9..ae6045f3fc 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChRemote.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ChRemote.java @@ -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.hash; +package org.eolang.maven; import com.jcabi.log.Logger; import org.cactoos.Text; @@ -31,7 +31,7 @@ * * @since 0.26 */ -public final class ChRemote implements CommitHash { +final class ChRemote implements CommitHash { /** * Cached text of hashes. @@ -48,7 +48,7 @@ public final class ChRemote implements CommitHash { * * @param tag Tag */ - public ChRemote(final String tag) { + ChRemote(final String tag) { this.tag = tag; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChText.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ChText.java similarity index 97% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChText.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/ChText.java index e2de063764..48da30867e 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/ChText.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ChText.java @@ -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.hash; +package org.eolang.maven; import java.nio.file.Path; import org.cactoos.Scalar; @@ -40,7 +40,7 @@ * * @since 0.28.11 */ -public final class ChText implements CommitHash { +final class ChText implements CommitHash { /** * Commit Hash text source. @@ -58,7 +58,7 @@ public final class ChText implements CommitHash { * @param file Path to offline file with hashes and tags. * @param tag Lookup tag. */ - public ChText(final Path file, final String tag) { + ChText(final Path file, final String tag) { this(() -> new TextOf(new InputOf(file)).asString(), tag); } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHash.java b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHash.java similarity index 88% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHash.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/CommitHash.java index 56aed7e6e2..b52e92ee43 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHash.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHash.java @@ -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.hash; +package org.eolang.maven; import org.cactoos.Scalar; @@ -31,7 +31,11 @@ * @since 0.28.11 */ @FunctionalInterface -public interface CommitHash extends Scalar { +interface CommitHash extends Scalar { + /** + * Fake commit hash for testing. + */ + CommitHash FAKE = new CommitHash.ChConstant("abcdef"); /** * SHA Hash. @@ -57,7 +61,7 @@ final class ChConstant implements CommitHash { * * @param hash Hardcoded value. */ - public ChConstant(final String hash) { + ChConstant(final String hash) { this.hash = hash; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesMap.java b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java similarity index 95% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesMap.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java index f1e7682de5..17b4a20ed2 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesMap.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java @@ -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.hash; +package org.eolang.maven; import java.util.Map; import java.util.regex.Pattern; @@ -39,7 +39,7 @@ * * @since 0.29.6 */ -public final class CommitHashesMap extends MapEnvelope { +final class CommitHashesMap extends MapEnvelope { /** * Fake hashes. @@ -74,7 +74,7 @@ public final class CommitHashesMap extends MapEnvelope { /** * Constructor. */ - public CommitHashesMap() { + CommitHashesMap() { this(new CommitHashesText()::asString); } @@ -125,7 +125,7 @@ private static Map fromTable(final Scalar table) { * * @since 0.29.6 */ - public static final class Fake extends MapEnvelope { + static final class Fake extends MapEnvelope { /** * Ctor. */ diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesText.java b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesText.java similarity index 98% rename from eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesText.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesText.java index 6f92d60e99..5ab888421d 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/CommitHashesText.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesText.java @@ -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.hash; +package org.eolang.maven; import com.jcabi.aspects.RetryOnFailure; import com.jcabi.log.Logger; diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDefault.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsDefault.java similarity index 93% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDefault.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsDefault.java index 3e22c4b167..ccf7a8a2b9 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDefault.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsDefault.java @@ -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.dependencies; +package org.eolang.maven; import com.github.lombrozo.xnav.Filter; import com.github.lombrozo.xnav.Xnav; @@ -34,22 +34,18 @@ import java.util.Optional; import java.util.stream.Collectors; import org.apache.maven.model.Dependency; -import org.eolang.maven.Coordinates; -import org.eolang.maven.ParseMojo; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.ForeignTojos; /** * It is a list of dependencies that are needed by the build. * * @since 0.29.0 */ -public final class DcsDefault implements Iterable { +final class DcsDefault implements Iterable { /** * List of tojos. */ - private final ForeignTojos tojos; + private final TjsForeign tojos; /** * Discover self too. @@ -67,8 +63,8 @@ public final class DcsDefault implements Iterable { * @param self Self * @param skip Skip */ - public DcsDefault( - final ForeignTojos tjs, + DcsDefault( + final TjsForeign tjs, final boolean self, final boolean skip ) { @@ -79,13 +75,13 @@ public DcsDefault( @Override public Iterator iterator() { - final Collection list = this.tojos.dependencies(); + final Collection list = this.tojos.dependencies(); Logger.debug( this, "%d suitable tojo(s) found out of %d", list.size(), this.tojos.size() ); final Collection deps = new HashSet<>(0); - for (final ForeignTojo tojo : list) { + for (final TjForeign tojo : list) { if (ParseMojo.ZERO.equals(tojo.version()) && !this.discover) { Logger.debug( diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDepgraph.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsDepgraph.java similarity index 98% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDepgraph.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsDepgraph.java index 90fb9a4ccb..5183ae7e8d 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsDepgraph.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsDepgraph.java @@ -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.dependencies; +package org.eolang.maven; import com.jcabi.log.Logger; import java.io.IOException; @@ -53,7 +53,7 @@ * @since 0.28.11 * @checkstyle NoJavadocForOverriddenMethodsCheck (200 lines) */ -public final class DcsDepgraph implements Iterable { +final class DcsDepgraph implements Iterable { /** * Maven project. @@ -90,7 +90,7 @@ public final class DcsDepgraph implements Iterable { * @param dep Dependency * @checkstyle ParameterNumberCheck (10 lines) */ - public DcsDepgraph( + DcsDepgraph( final MavenProject pkt, final MavenSession ssn, final BuildPluginManager mgr, diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsEachWithoutTransitive.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsEachWithoutTransitive.java similarity index 94% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsEachWithoutTransitive.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsEachWithoutTransitive.java index 3214558dc8..2846b6d1d3 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsEachWithoutTransitive.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsEachWithoutTransitive.java @@ -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.dependencies; +package org.eolang.maven; import java.util.Iterator; import java.util.Objects; @@ -29,15 +29,13 @@ import org.cactoos.Func; import org.cactoos.iterable.Filtered; import org.cactoos.iterable.Mapped; -import org.eolang.maven.Coordinates; -import org.eolang.maven.ResolveMojo; /** * Dependencies without transitive dependencies. * * @since 0.29.0 */ -public final class DcsEachWithoutTransitive implements Iterable { +final class DcsEachWithoutTransitive implements Iterable { /** * Original dependencies. @@ -54,7 +52,7 @@ public final class DcsEachWithoutTransitive implements Iterable { * @param dependencies Dependencies * @param strategy Strategy */ - public DcsEachWithoutTransitive( + DcsEachWithoutTransitive( final Iterable dependencies, final Func> strategy ) { diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsFake.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsFake.java similarity index 97% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsFake.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsFake.java index dc814492cf..943d5ba3fb 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsFake.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsFake.java @@ -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.dependencies; +package org.eolang.maven; import java.security.SecureRandom; import java.util.Arrays; @@ -38,7 +38,7 @@ * * @since 0.30 */ -public final class DcsFake implements Iterable { +final class DcsFake implements Iterable { /** * Dependencies. diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsUniquelyVersioned.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsUniquelyVersioned.java similarity index 94% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsUniquelyVersioned.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsUniquelyVersioned.java index 57a31a82cf..6091cada9e 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsUniquelyVersioned.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsUniquelyVersioned.java @@ -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.dependencies; +package org.eolang.maven; import java.util.Collection; import java.util.Iterator; @@ -37,7 +37,7 @@ * * @since 0.28.11 */ -public final class DcsUniquelyVersioned implements Iterable { +final class DcsUniquelyVersioned implements Iterable { /** * Source of dependencies. @@ -49,7 +49,7 @@ public final class DcsUniquelyVersioned implements Iterable { * * @param dlg Source of dependencies. */ - public DcsUniquelyVersioned(final Iterable dlg) { + DcsUniquelyVersioned(final Iterable dlg) { this.delegate = dlg; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithRuntime.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithRuntime.java similarity index 96% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithRuntime.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithRuntime.java index c90b5f620e..7b2293ee41 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithRuntime.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithRuntime.java @@ -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.dependencies; +package org.eolang.maven; import com.github.lombrozo.xnav.Xnav; import com.jcabi.aspects.RetryOnFailure; @@ -41,7 +41,7 @@ * * @since 0.28.11 */ -public final class DcsWithRuntime implements Iterable { +final class DcsWithRuntime implements Iterable { /** * Dependency downloaded by HTTP from Maven Central. @@ -63,7 +63,7 @@ public final class DcsWithRuntime implements Iterable { * * @param dlg Dependencies delegate. */ - public DcsWithRuntime(final Iterable dlg) { + DcsWithRuntime(final Iterable dlg) { this(dlg, DcsWithRuntime.MAVEN_DEPENDENCY); } @@ -73,7 +73,7 @@ public DcsWithRuntime(final Iterable dlg) { * @param dlg Dependencies delegate. * @param sup Dependency. */ - public DcsWithRuntime( + DcsWithRuntime( final Iterable dlg, final Dependency sup ) { diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithoutRuntime.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithoutRuntime.java similarity index 90% rename from eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithoutRuntime.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithoutRuntime.java index 5706dcffde..b2f177b404 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/DcsWithoutRuntime.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/DcsWithoutRuntime.java @@ -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.dependencies; +package org.eolang.maven; import java.util.Iterator; import org.apache.maven.model.Dependency; @@ -33,7 +33,7 @@ * * @since 0.29 */ -public final class DcsWithoutRuntime implements Iterable { +final class DcsWithoutRuntime implements Iterable { /** * All dependencies. @@ -44,7 +44,7 @@ public final class DcsWithoutRuntime implements Iterable { * Constructor. * @param decoratee Dependencies delegate. */ - public DcsWithoutRuntime(final Iterable decoratee) { + DcsWithoutRuntime(final Iterable decoratee) { this.delegate = decoratee; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/LatexMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/LatexMojo.java index a20d5fd3dd..46170ddb08 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/LatexMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/LatexMojo.java @@ -29,7 +29,6 @@ import java.nio.file.Path; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; -import org.eolang.maven.tojos.ForeignTojo; import org.eolang.maven.util.HmBase; /** @@ -80,7 +79,7 @@ static String last(final String input) { @Override void exec() throws IOException { - for (final ForeignTojo tojo : this.scopedTojos().withShaken()) { + for (final TjForeign tojo : this.scopedTojos().withShaken()) { final Path file = tojo.shaken(); final Path dir = this.targetDir.toPath(); final Path target = new Place( diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/LintMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/LintMojo.java index 301ec2518e..eeceedccd3 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/LintMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/LintMojo.java @@ -42,8 +42,6 @@ import org.eolang.lints.Programs; import org.eolang.lints.Severity; import org.eolang.maven.footprint.FpDefault; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.TojoHash; import org.eolang.maven.util.Threaded; import org.w3c.dom.Node; import org.xembly.Directives; @@ -86,7 +84,7 @@ void exec() throws IOException { */ private void lint() throws IOException { final long start = System.currentTimeMillis(); - final Collection tojos = this.scopedTojos().withShaken(); + final Collection tojos = this.scopedTojos().withShaken(); final ConcurrentHashMap counts = new ConcurrentHashMap<>(); counts.putIfAbsent(Severity.CRITICAL, 0); counts.putIfAbsent(Severity.ERROR, 0); @@ -140,7 +138,7 @@ private void lint() throws IOException { * @return Amount of passed tojos (1 if passed, 0 if errors) * @throws Exception If failed to lint */ - private int lintOne(final ForeignTojo tojo, + private int lintOne(final TjForeign tojo, final ConcurrentHashMap counts) throws Exception { final Path source = tojo.shaken(); final XML xmir = new XMLDocument(source); @@ -166,10 +164,10 @@ private int lintOne(final ForeignTojo tojo, */ private int lintAll(final ConcurrentHashMap counts) throws IOException { final Map paths = new HashMap<>(); - for (final ForeignTojo tojo : this.scopedTojos().withShaken()) { + for (final TjForeign tojo : this.scopedTojos().withShaken()) { paths.put(tojo.identifier(), tojo.shaken()); } - for (final ForeignTojo tojo : this.compileTojos().withShaken()) { + for (final TjForeign tojo : this.compileTojos().withShaken()) { paths.put(tojo.identifier(), tojo.shaken()); } final Map pkg = new HashMap<>(); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/MarkMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/MarkMojo.java index efd62ddaa4..3a30c971de 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/MarkMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/MarkMojo.java @@ -32,7 +32,6 @@ import java.util.regex.Pattern; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; -import org.eolang.maven.tojos.ForeignTojos; import org.eolang.maven.util.Walk; /** @@ -76,7 +75,7 @@ public void exec() throws IOException { private long scan(final Path dir, final String version) { final Unplace unplace = new Unplace(dir); final Collection sources = new Walk(dir); - final ForeignTojos tojos = this.scopedTojos(); + final TjsForeign tojos = this.scopedTojos(); final long done = sources.stream() .filter(src -> src.toString().endsWith(".eo")) .map(unplace::make) diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/OyRemote.java b/eo-maven-plugin/src/main/java/org/eolang/maven/OyRemote.java index 640a7a4eeb..18f5f77400 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/OyRemote.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/OyRemote.java @@ -33,7 +33,6 @@ import org.cactoos.Input; import org.cactoos.io.InputOf; import org.cactoos.io.InputWithFallback; -import org.eolang.maven.hash.CommitHash; /** * The simple HTTP Objectionary server. 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 index 224bde8276..26b4062091 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/ParseMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ParseMojo.java @@ -37,8 +37,6 @@ import org.cactoos.io.InputOf; import org.cactoos.iterable.Filtered; import org.eolang.maven.footprint.FpDefault; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.TojoHash; import org.eolang.maven.util.Threaded; import org.eolang.parser.EoSyntax; import org.xembly.Directives; @@ -77,7 +75,7 @@ public void exec() { final long start = System.currentTimeMillis(); final int total = new Threaded<>( new Filtered<>( - ForeignTojo::notParsed, + TjForeign::notParsed, this.scopedTojos().withSources() ), this::parsed @@ -112,7 +110,7 @@ public void exec() { * @throws IOException If fails */ @SuppressWarnings({"PMD.AvoidCatchingGenericException", "PMD.ExceptionAsFlowControl"}) - private int parsed(final ForeignTojo tojo) throws Exception { + private int parsed(final TjForeign tojo) throws Exception { final Path source = tojo.source(); final String name = tojo.identifier(); final Path base = this.targetDir.toPath().resolve(ParseMojo.DIR); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java index b4523b1d51..8f433c844b 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java @@ -36,7 +36,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.cactoos.io.InputOf; import org.cactoos.scalar.Unchecked; -import org.eolang.maven.tojos.PlacedTojo; import org.eolang.maven.util.HmBase; import org.eolang.maven.util.HmOptional; import org.eolang.maven.util.Walk; @@ -237,7 +236,7 @@ private boolean isNotAlreadyPlaced(final Path file) { final Path target = PlaceMojo.this.outputDir.toPath().resolve( this.dir.relativize(file) ); - final Optional tojo = PlaceMojo.this.placedTojos.find(target); + final Optional tojo = PlaceMojo.this.placedTojos.find(target); final boolean res; if (tojo.isPresent() && Files.exists(target) && (this.sameLength(target, file) || !tojo.get().unplaced())) { @@ -261,7 +260,7 @@ private void printLogInfoAboutBinary(final Path file) { final Path target = PlaceMojo.this.outputDir.toPath().resolve( this.dir.relativize(file) ); - final Optional tojo = PlaceMojo.this.placedTojos.find(target); + final Optional tojo = PlaceMojo.this.placedTojos.find(target); if (tojo.isPresent()) { if (!Files.exists(target)) { Logger.info( diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java index 0f7fc76a73..47b1abe654 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java @@ -39,11 +39,6 @@ import org.cactoos.iterable.IterableOf; import org.cactoos.iterable.Mapped; import org.cactoos.list.ListOf; -import org.eolang.maven.hash.ChCached; -import org.eolang.maven.hash.ChNarrow; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.CommitHash; -import org.eolang.maven.tojos.ForeignTojo; /** * Go through all `probe` metas in XMIR files, try to locate the @@ -100,8 +95,8 @@ public void exec() throws IOException { private void probe() throws IOException { final long start = System.currentTimeMillis(); final Collection probed = new HashSet<>(0); - final Collection tojos = this.scopedTojos().unprobed(); - for (final ForeignTojo tojo : tojos) { + final Collection tojos = this.scopedTojos().unprobed(); + for (final TjForeign tojo : tojos) { final Path src = tojo.shaken(); final Collection objects = this.probes(src); if (!objects.isEmpty()) { 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 index 4f1738ddec..0f1df083b2 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java @@ -42,11 +42,6 @@ import org.eolang.maven.footprint.FpIgnore; import org.eolang.maven.footprint.FpUpdateBoth; import org.eolang.maven.footprint.FpUpdateFromCache; -import org.eolang.maven.hash.ChCached; -import org.eolang.maven.hash.ChNarrow; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.CommitHash; -import org.eolang.maven.tojos.ForeignTojo; /** * Pull EO files from Objectionary. @@ -107,11 +102,11 @@ public void exec() throws IOException { @SuppressWarnings("PMD.PrematureDeclaration") private void pull() throws IOException { final long start = System.currentTimeMillis(); - final Collection tojos = this.scopedTojos().withoutSources(); + final Collection tojos = this.scopedTojos().withoutSources(); final Collection names = new ArrayList<>(0); final Path base = this.targetDir.toPath().resolve(PullMojo.DIR); final String hsh = this.hash.value(); - for (final ForeignTojo tojo : tojos) { + for (final TjForeign tojo : tojos) { final String object = tojo.identifier(); try { tojo.withSource(this.pulled(object, base, hsh)) 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 index cab3b82180..5d2ff5ea38 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java @@ -40,12 +40,6 @@ import org.cactoos.iterable.Mapped; import org.cactoos.list.ListOf; import org.cactoos.text.Joined; -import org.eolang.maven.dependencies.DcsDefault; -import org.eolang.maven.dependencies.DcsDepgraph; -import org.eolang.maven.dependencies.DcsEachWithoutTransitive; -import org.eolang.maven.dependencies.DcsUniquelyVersioned; -import org.eolang.maven.dependencies.DcsWithRuntime; -import org.eolang.maven.dependencies.DcsWithoutRuntime; import org.eolang.maven.util.Walk; /** 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 index b65f9e9b19..d8ac257106 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java @@ -53,9 +53,6 @@ import org.apache.maven.project.MavenProject; import org.cactoos.scalar.Sticky; import org.cactoos.set.SetOf; -import org.eolang.maven.tojos.ForeignTojos; -import org.eolang.maven.tojos.PlacedTojos; -import org.eolang.maven.tojos.TranspiledTojos; import org.slf4j.impl.StaticLoggerBinder; /** @@ -425,7 +422,7 @@ abstract class SafeMojo extends AbstractMojo { * @checkstyle MemberNameCheck (7 lines) * @checkstyle VisibilityModifierCheck (5 lines) */ - protected final PlacedTojos placedTojos = new PlacedTojos( + protected final TjsPlaced placedTojos = new TjsPlaced( new Sticky<>(() -> Catalogs.INSTANCE.make(this.placed.toPath(), this.placedFormat)) ); @@ -434,7 +431,7 @@ abstract class SafeMojo extends AbstractMojo { * @checkstyle MemberNameCheck (7 lines) * @checkstyle VisibilityModifierCheck (5 lines) */ - protected final TranspiledTojos transpiledTojos = new TranspiledTojos( + protected final TjsTranspiled transpiledTojos = new TjsTranspiled( new Sticky<>(() -> Catalogs.INSTANCE.make(this.transpiled.toPath(), this.transpiledFormat)) ); @@ -451,7 +448,7 @@ abstract class SafeMojo extends AbstractMojo { * Cached tojos. * @checkstyle VisibilityModifierCheck (5 lines) */ - private final ForeignTojos tojos = new ForeignTojos( + private final TjsForeign tojos = new TjsForeign( () -> Catalogs.INSTANCE.make(this.foreign.toPath(), this.foreignFormat), () -> this.scope ); @@ -531,7 +528,7 @@ public final void execute() throws MojoFailureException { * @return Tojos to use * @checkstyle AnonInnerLengthCheck (100 lines) */ - protected final ForeignTojos scopedTojos() { + protected final TjsForeign scopedTojos() { return this.tojos; } @@ -540,8 +537,8 @@ protected final ForeignTojos scopedTojos() { * @return Tojos to use * @checkstyle AnonInnerLengthCheck (100 lines) */ - protected final ForeignTojos compileTojos() { - return new ForeignTojos( + protected final TjsForeign compileTojos() { + return new TjsForeign( () -> Catalogs.INSTANCE.make(this.foreign.toPath(), this.foreignFormat), () -> "compile" ); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java index a52ced74da..da4ab53941 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java @@ -37,8 +37,6 @@ import org.cactoos.func.StickyFunc; import org.cactoos.iterable.Filtered; import org.eolang.maven.footprint.FpDefault; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.TojoHash; import org.eolang.maven.util.Threaded; /** @@ -71,11 +69,11 @@ public final class ShakeMojo extends SafeMojo { @Override public void exec() { final long start = System.currentTimeMillis(); - final Collection tojos = this.scopedTojos().withXmir(); + final Collection tojos = this.scopedTojos().withXmir(); final Function transform = this.transformations(); final int total = new Threaded<>( new Filtered<>( - ForeignTojo::notShaken, + TjForeign::notShaken, tojos ), tojo -> this.shaken(tojo, transform) @@ -99,7 +97,7 @@ public void exec() { * @return Amount of optimized XMIR files * @throws Exception If fails */ - private int shaken(final ForeignTojo tojo, final Function transform) + private int shaken(final TjForeign tojo, final Function transform) throws Exception { final Path source = tojo.xmir(); final XML xmir = new XMLDocument(source); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/SodgMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/SodgMojo.java index a35b8b583c..94ba7bbeec 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/SodgMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/SodgMojo.java @@ -66,7 +66,6 @@ import org.cactoos.scalar.IoChecked; import org.cactoos.scalar.LengthOf; import org.cactoos.set.SetOf; -import org.eolang.maven.tojos.ForeignTojo; import org.eolang.maven.util.HmBase; import org.eolang.parser.StXPath; import org.xembly.Directive; @@ -349,7 +348,7 @@ public void exec() throws IOException { "Setting generateDotFiles and not setting generateGraphFiles has no effect because .dot files require .graph files" ); } - final Collection tojos = this.scopedTojos().withShaken(); + final Collection tojos = this.scopedTojos().withShaken(); final Path home = this.targetDir.toPath().resolve(SodgMojo.DIR); int total = 0; int instructions = 0; @@ -359,7 +358,7 @@ public void exec() throws IOException { final Set excludes = this.sodgExcludes.stream() .map(i -> Pattern.compile(SodgMojo.createMatcher(i))) .collect(Collectors.toSet()); - for (final ForeignTojo tojo : tojos) { + for (final TjForeign tojo : tojos) { final String name = tojo.identifier(); if (this.exclude(name, includes, excludes)) { continue; diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TjForeign.java similarity index 69% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TjForeign.java index 52eb8b0f55..d461109a2b 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TjForeign.java @@ -21,15 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.tojos; +package org.eolang.maven; import com.jcabi.log.Logger; import com.yegor256.tojos.Tojo; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; -import org.eolang.maven.Coordinates; -import org.eolang.maven.hash.CommitHash; /** * Foreign tojo. @@ -37,7 +35,7 @@ * @since 0.30 */ @SuppressWarnings({"PMD.TooManyMethods", "PMD.GodClass"}) -public final class ForeignTojo { +final class TjForeign { /** * The delegate. @@ -48,7 +46,7 @@ public final class ForeignTojo { * Ctor. * @param original The delegate. */ - public ForeignTojo(final Tojo original) { + TjForeign(final Tojo original) { this.delegate = original; } @@ -62,7 +60,7 @@ public String toString() { * @return The id of the tojo. */ public String identifier() { - return this.attribute(ForeignTojos.Attribute.ID); + return this.attribute(TjsForeign.Attribute.ID); } /** @@ -70,7 +68,7 @@ public String identifier() { * @return The xmir. */ public Path xmir() { - return Paths.get(this.attribute(ForeignTojos.Attribute.XMIR)); + return Paths.get(this.attribute(TjsForeign.Attribute.XMIR)); } /** @@ -78,7 +76,7 @@ public Path xmir() { * @return The shaken xmir. */ public Path shaken() { - return Paths.get(this.attribute(ForeignTojos.Attribute.SHAKEN)); + return Paths.get(this.attribute(TjsForeign.Attribute.SHAKEN)); } /** @@ -86,7 +84,7 @@ public Path shaken() { * @return The shaken xmir. */ public Path linted() { - return Paths.get(this.attribute(ForeignTojos.Attribute.LINTED)); + return Paths.get(this.attribute(TjsForeign.Attribute.LINTED)); } /** @@ -94,7 +92,7 @@ public Path linted() { * @return The eo object. */ public Path source() { - return Paths.get(this.attribute(ForeignTojos.Attribute.EO)); + return Paths.get(this.attribute(TjsForeign.Attribute.EO)); } /** @@ -102,7 +100,7 @@ public Path source() { * @return The version. */ public String version() { - return this.attribute(ForeignTojos.Attribute.VERSION); + return this.attribute(TjsForeign.Attribute.VERSION); } /** @@ -112,7 +110,7 @@ public String version() { public String description() { return String.format( "%s:%s", - this.attribute(ForeignTojos.Attribute.ID), + this.attribute(TjsForeign.Attribute.ID), this.version() ); } @@ -122,7 +120,7 @@ public String description() { * @return The hash. */ public String hash() { - return this.attribute(ForeignTojos.Attribute.HASH); + return this.attribute(TjsForeign.Attribute.HASH); } /** @@ -130,7 +128,7 @@ public String hash() { * @return The probed. */ public String probed() { - return this.attribute(ForeignTojos.Attribute.PROBED); + return this.attribute(TjsForeign.Attribute.PROBED); } /** @@ -138,7 +136,7 @@ public String probed() { * @return The discovered at. */ public String discoveredAt() { - return this.attribute(ForeignTojos.Attribute.DISCOVERED_AT); + return this.attribute(TjsForeign.Attribute.DISCOVERED_AT); } /** @@ -148,7 +146,7 @@ public String discoveredAt() { public boolean notShaken() { final Path src = this.xmir(); boolean res = true; - if (this.delegate.exists(ForeignTojos.Attribute.SHAKEN.getKey())) { + if (this.delegate.exists(TjsForeign.Attribute.SHAKEN.getKey())) { final Path tgt = this.shaken(); if (tgt.toFile().lastModified() >= src.toFile().lastModified()) { Logger.debug(this, "Already shaken %[file]s to %[file]s", src, tgt); @@ -165,7 +163,7 @@ public boolean notShaken() { */ public boolean notParsed() { boolean res = true; - if (this.delegate.exists(ForeignTojos.Attribute.XMIR.getKey())) { + if (this.delegate.exists(TjsForeign.Attribute.XMIR.getKey())) { final Path xmir = this.xmir(); if (xmir.toFile().lastModified() >= this.source().toFile().lastModified()) { Logger.debug( @@ -183,7 +181,7 @@ public boolean notParsed() { * @return True if has hash, false otherwise. */ public boolean hasHash() { - return this.delegate.exists(ForeignTojos.Attribute.HASH.getKey()); + return this.delegate.exists(TjsForeign.Attribute.HASH.getKey()); } /** @@ -191,8 +189,8 @@ public boolean hasHash() { * @param coordinates The coordinates of jar. * @return The tojo itself. */ - public ForeignTojo withJar(final Coordinates coordinates) { - this.delegate.set(ForeignTojos.Attribute.JAR.getKey(), coordinates.toString()); + public TjForeign withJar(final Coordinates coordinates) { + this.delegate.set(TjsForeign.Attribute.JAR.getKey(), coordinates.toString()); return this; } @@ -201,11 +199,11 @@ public ForeignTojo withJar(final Coordinates coordinates) { * @param path The path where was discovered. * @return The tojo itself. */ - public ForeignTojo withDiscoveredAt(final Path path) { - if (!this.delegate.exists(ForeignTojos.Attribute.VERSION.getKey())) { - this.delegate.set(ForeignTojos.Attribute.VERSION.getKey(), "*.*.*"); + public TjForeign withDiscoveredAt(final Path path) { + if (!this.delegate.exists(TjsForeign.Attribute.VERSION.getKey())) { + this.delegate.set(TjsForeign.Attribute.VERSION.getKey(), "*.*.*"); } - this.delegate.set(ForeignTojos.Attribute.DISCOVERED_AT.getKey(), path); + this.delegate.set(TjsForeign.Attribute.DISCOVERED_AT.getKey(), path); return this; } @@ -214,8 +212,8 @@ public ForeignTojo withDiscoveredAt(final Path path) { * @param sodg Sodg. * @return The tojo itself. */ - public ForeignTojo withSodg(final Path sodg) { - this.delegate.set(ForeignTojos.Attribute.SODG.getKey(), sodg.toString()); + public TjForeign withSodg(final Path sodg) { + this.delegate.set(TjsForeign.Attribute.SODG.getKey(), sodg.toString()); return this; } @@ -224,8 +222,8 @@ public ForeignTojo withSodg(final Path sodg) { * @param xmir The shaken xmir. * @return The tojo itself. */ - public ForeignTojo withShaken(final Path xmir) { - this.delegate.set(ForeignTojos.Attribute.SHAKEN.getKey(), xmir.toString()); + public TjForeign withShaken(final Path xmir) { + this.delegate.set(TjsForeign.Attribute.SHAKEN.getKey(), xmir.toString()); return this; } @@ -234,8 +232,8 @@ public ForeignTojo withShaken(final Path xmir) { * @param xmir The linted xmir. * @return The tojo itself. */ - public ForeignTojo withLinted(final Path xmir) { - this.delegate.set(ForeignTojos.Attribute.LINTED.getKey(), xmir.toString()); + public TjForeign withLinted(final Path xmir) { + this.delegate.set(TjsForeign.Attribute.LINTED.getKey(), xmir.toString()); return this; } @@ -244,8 +242,8 @@ public ForeignTojo withLinted(final Path xmir) { * @param source The eo path. * @return The tojo itself. */ - public ForeignTojo withSource(final Path source) { - this.delegate.set(ForeignTojos.Attribute.EO.getKey(), source.toString()); + public TjForeign withSource(final Path source) { + this.delegate.set(TjsForeign.Attribute.EO.getKey(), source.toString()); return this; } @@ -254,8 +252,8 @@ public ForeignTojo withSource(final Path source) { * @param hash The hash. * @return The tojo itself. */ - public ForeignTojo withHash(final CommitHash hash) { - this.delegate.set(ForeignTojos.Attribute.HASH.getKey(), hash.value()); + public TjForeign withHash(final CommitHash hash) { + this.delegate.set(TjsForeign.Attribute.HASH.getKey(), hash.value()); return this; } @@ -264,8 +262,8 @@ public ForeignTojo withHash(final CommitHash hash) { * @param count The number of probed objects. * @return The tojo itself. */ - public ForeignTojo withProbed(final int count) { - this.delegate.set(ForeignTojos.Attribute.PROBED.getKey(), Integer.toString(count)); + public TjForeign withProbed(final int count) { + this.delegate.set(TjsForeign.Attribute.PROBED.getKey(), Integer.toString(count)); return this; } @@ -274,8 +272,8 @@ public ForeignTojo withProbed(final int count) { * @param xmir The xmir. * @return The tojo itself. */ - public ForeignTojo withXmir(final Path xmir) { - this.delegate.set(ForeignTojos.Attribute.XMIR.getKey(), xmir.toString()); + public TjForeign withXmir(final Path xmir) { + this.delegate.set(TjsForeign.Attribute.XMIR.getKey(), xmir.toString()); return this; } @@ -284,8 +282,8 @@ public ForeignTojo withXmir(final Path xmir) { * @param ver The version. * @return The tojo itself. */ - public ForeignTojo withVersion(final String ver) { - this.delegate.set(ForeignTojos.Attribute.VERSION.getKey(), ver); + public TjForeign withVersion(final String ver) { + this.delegate.set(TjsForeign.Attribute.VERSION.getKey(), ver); return this; } @@ -294,8 +292,8 @@ public ForeignTojo withVersion(final String ver) { * @param scope The scope. * @return The tojo itself. */ - public ForeignTojo withScope(final String scope) { - this.delegate.set(ForeignTojos.Attribute.SCOPE.getKey(), scope); + public TjForeign withScope(final String scope) { + this.delegate.set(TjsForeign.Attribute.SCOPE.getKey(), scope); return this; } @@ -304,7 +302,7 @@ public ForeignTojo withScope(final String scope) { * @return The scope. */ public String scope() { - return this.attribute(ForeignTojos.Attribute.SCOPE); + return this.attribute(TjsForeign.Attribute.SCOPE); } @Override @@ -315,7 +313,7 @@ public boolean equals(final Object other) { } else if (other == null || this.getClass() != other.getClass()) { result = false; } else { - final ForeignTojo tojo = (ForeignTojo) other; + final TjForeign tojo = (TjForeign) other; result = Objects.equals(this.delegate, tojo.delegate); } return result; @@ -331,7 +329,7 @@ public int hashCode() { * @param attribute The attribute from ForeignTojos.Attribute. * @return The attribute. */ - private String attribute(final ForeignTojos.Attribute attribute) { + private String attribute(final TjsForeign.Attribute attribute) { final String attr = this.delegate.get(attribute.getKey()); if (attr == null) { throw new AttributeNotFoundException(attribute); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TjPlaced.java similarity index 77% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojo.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TjPlaced.java index 350b6f1987..41ebf12cef 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TjPlaced.java @@ -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.tojos; +package org.eolang.maven; import com.yegor256.tojos.Tojo; @@ -30,7 +30,7 @@ * * @since 0.30 */ -public final class PlacedTojo { +final class TjPlaced { /** * The delegate. @@ -41,7 +41,7 @@ public final class PlacedTojo { * Ctor. * @param tojo The delegate. */ - PlacedTojo(final Tojo tojo) { + TjPlaced(final Tojo tojo) { this.origin = tojo; } @@ -50,7 +50,7 @@ public final class PlacedTojo { * @return The id. */ public String identifier() { - return this.origin.get(PlacedTojos.Attribute.ID.getKey()); + return this.origin.get(TjsPlaced.Attribute.ID.getKey()); } /** @@ -58,7 +58,7 @@ public String identifier() { * @return The dependency. */ public String dependency() { - return this.origin.get(PlacedTojos.Attribute.DEPENDENCY.getKey()); + return this.origin.get(TjsPlaced.Attribute.DEPENDENCY.getKey()); } /** @@ -66,7 +66,7 @@ public String dependency() { * @return The related file path. */ public String related() { - return this.origin.get(PlacedTojos.Attribute.RELATED.getKey()); + return this.origin.get(TjsPlaced.Attribute.RELATED.getKey()); } /** @@ -75,14 +75,14 @@ public String related() { * @return True if the hash is the same. */ public boolean sameHash(final String hash) { - return this.origin.get(PlacedTojos.Attribute.HASH.getKey()).equals(hash); + return this.origin.get(TjsPlaced.Attribute.HASH.getKey()).equals(hash); } /** * Mark the tojo as unplaced. */ public void unplace() { - this.origin.set(PlacedTojos.Attribute.UNPLACED.getKey(), "true"); + this.origin.set(TjsPlaced.Attribute.UNPLACED.getKey(), "true"); } /** @@ -90,7 +90,7 @@ public void unplace() { * @return True if the tojo is a class. */ public boolean isClass() { - return "class".equals(this.origin.get(PlacedTojos.Attribute.KIND.getKey())); + return "class".equals(this.origin.get(TjsPlaced.Attribute.KIND.getKey())); } /** @@ -98,7 +98,7 @@ public boolean isClass() { * @return True if the tojo is a jar. */ public boolean isJar() { - return "jar".equals(this.origin.get(PlacedTojos.Attribute.KIND.getKey())); + return "jar".equals(this.origin.get(TjsPlaced.Attribute.KIND.getKey())); } /** @@ -114,7 +114,7 @@ public boolean placed() { * @return True if the tojo is unplaced. */ public boolean unplaced() { - return this.origin.exists(PlacedTojos.Attribute.UNPLACED.getKey()) - && "true".equals(this.origin.get(PlacedTojos.Attribute.UNPLACED.getKey())); + return this.origin.exists(TjsPlaced.Attribute.UNPLACED.getKey()) + && "true".equals(this.origin.get(TjsPlaced.Attribute.UNPLACED.getKey())); } } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsForeign.java similarity index 90% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TjsForeign.java index e278f1c0e6..1974be45ba 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsForeign.java @@ -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.tojos; +package org.eolang.maven; import com.yegor256.tojos.MnMemory; import com.yegor256.tojos.TjCached; @@ -46,7 +46,7 @@ * @since 0.30 */ @SuppressWarnings("PMD.TooManyMethods") -public final class ForeignTojos implements Closeable { +final class TjsForeign implements Closeable { /** * The delegate. @@ -63,7 +63,7 @@ public final class ForeignTojos implements Closeable { * @param scalar Scalar * @param scope Scope */ - public ForeignTojos(final Scalar scalar, final Supplier scope) { + TjsForeign(final Scalar scalar, final Supplier scope) { this(new Unchecked<>(new Sticky<>(scalar)), scope); } @@ -71,7 +71,7 @@ public ForeignTojos(final Scalar scalar, final Supplier scope) { * Constructor for tests. * Keeps all tojos in memory. */ - ForeignTojos() { + TjsForeign() { this(() -> new TjSmart(new TjCached(new TjDefault(new MnMemory())))); } @@ -79,7 +79,7 @@ public ForeignTojos(final Scalar scalar, final Supplier scope) { * Ctor with the default scope. * @param scalar Scalar */ - private ForeignTojos(final Scalar scalar) { + private TjsForeign(final Scalar scalar) { this(scalar, () -> "compile"); } @@ -88,7 +88,7 @@ private ForeignTojos(final Scalar scalar) { * @param tojos The tojos. * @param scope The scope. */ - private ForeignTojos( + private TjsForeign( final Unchecked tojos, final Supplier scope ) { @@ -106,12 +106,12 @@ public void close() throws IOException { * @param name The name of the tojo. * @return The tojo. */ - public ForeignTojo add(final String name) { + public TjForeign add(final String name) { final Tojo tojo = this.tojos.value().add(name); if (!tojo.exists(Attribute.SCOPE.getKey())) { tojo.set(Attribute.SCOPE.getKey(), this.scope.get()); } - return new ForeignTojo(tojo); + return new TjForeign(tojo); } /** @@ -119,8 +119,8 @@ public ForeignTojo add(final String name) { * @param id The id of the tojo. * @return The tojo. */ - public ForeignTojo find(final String id) { - return new ForeignTojo( + public TjForeign find(final String id) { + return new TjForeign( this.tojos.value() .select(tojo -> tojo.get(Attribute.ID.getKey()).equals(id)) .stream() @@ -137,7 +137,7 @@ public ForeignTojo find(final String id) { * Get the tojos that have corresponding xmir. * @return The tojos. */ - public Collection withXmir() { + public Collection withXmir() { return this.select(row -> row.exists(Attribute.XMIR.getKey())); } @@ -145,7 +145,7 @@ public Collection withXmir() { * Get the tojos that have corresponding shaken XMIR. * @return The tojos. */ - public Collection withShaken() { + public Collection withShaken() { return this.select(row -> row.exists(Attribute.SHAKEN.getKey())); } @@ -153,7 +153,7 @@ public Collection withShaken() { * Get the tojos that doesn't have dependency. * @return The tojos. */ - public Collection dependencies() { + public Collection dependencies() { return this.select( t -> t.exists(Attribute.XMIR.getKey()) && t.exists(Attribute.VERSION.getKey()) @@ -165,7 +165,7 @@ public Collection dependencies() { * Get the tojos that have corresponding eo file. * @return The tojos. */ - public Collection withSources() { + public Collection withSources() { return this.select(row -> row.exists(Attribute.EO.getKey())); } @@ -173,7 +173,7 @@ public Collection withSources() { * Get the tojos that do not have corresponding eo and xmir. * @return The tojos. */ - public Collection withoutSources() { + public Collection withoutSources() { return this.select( row -> !row.exists(Attribute.EO.getKey()) && !row.exists(Attribute.XMIR.getKey()) @@ -184,7 +184,7 @@ public Collection withoutSources() { * Get the tojos that have not probed yet. * @return The tojos. */ - public Collection unprobed() { + public Collection unprobed() { return this.select( row -> row.exists(Attribute.SHAKEN.getKey()) && !row.exists(Attribute.PROBED.getKey()) @@ -195,7 +195,7 @@ public Collection unprobed() { * Get all tojos as a collection. * @return Collection of tojos. */ - public Collection all() { + public Collection all() { return this.select(all -> true); } @@ -245,12 +245,12 @@ public String status() { * @param filter Filter. * @return Selected tojos. */ - private Collection select(final Predicate filter) { + private Collection select(final Predicate filter) { final Predicate scoped = t -> t.get(Attribute.SCOPE.getKey()).equals(this.scope.get()); return this.tojos.value() .select(t -> filter.test(t) && scoped.test(t)) - .stream().map(ForeignTojo::new).collect(Collectors.toList()); + .stream().map(TjForeign::new).collect(Collectors.toList()); } /** diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojos.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsPlaced.java similarity index 87% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojos.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TjsPlaced.java index f34aafc4d1..183f778187 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/PlacedTojos.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsPlaced.java @@ -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.tojos; +package org.eolang.maven; import com.yegor256.tojos.Tojos; import java.io.Closeable; @@ -33,7 +33,6 @@ import java.util.stream.Collectors; import org.cactoos.scalar.Sticky; import org.cactoos.scalar.Unchecked; -import org.eolang.maven.Catalogs; import org.eolang.maven.util.FileHash; /** @@ -41,7 +40,7 @@ * * @since 0.30 */ -public final class PlacedTojos implements Closeable { +final class TjsPlaced implements Closeable { /** * All tojos. @@ -52,7 +51,7 @@ public final class PlacedTojos implements Closeable { * Ctor. * @param file Path to the tojos file. */ - public PlacedTojos(final Path file) { + TjsPlaced(final Path file) { this(Catalogs.INSTANCE.make(file)); } @@ -60,7 +59,7 @@ public PlacedTojos(final Path file) { * Ctor. * @param tojos Tojos source. */ - public PlacedTojos(final Sticky tojos) { + TjsPlaced(final Sticky tojos) { this(new Unchecked<>(tojos)); } @@ -68,7 +67,7 @@ public PlacedTojos(final Sticky tojos) { * Ctor. * @param tojos Tojos. */ - private PlacedTojos(final Tojos tojos) { + private TjsPlaced(final Tojos tojos) { this(new Sticky<>(() -> tojos)); } @@ -76,7 +75,7 @@ private PlacedTojos(final Tojos tojos) { * The main ctor. * @param tojos Tojos unchecked source. */ - private PlacedTojos(final Unchecked tojos) { + private TjsPlaced(final Unchecked tojos) { this.all = tojos; } @@ -89,9 +88,9 @@ public void close() throws IOException { * Get all classes. * @return All classes. */ - public Collection classes() { + public Collection classes() { return this.allBinaries().stream() - .filter(PlacedTojo::isClass) + .filter(TjPlaced::isClass) .collect(Collectors.toList()); } @@ -99,9 +98,9 @@ public Collection classes() { * Get all jars. * @return All jars. */ - public Collection jars() { + public Collection jars() { return this.allBinaries().stream() - .filter(PlacedTojo::isJar) + .filter(TjPlaced::isJar) .collect(Collectors.toList()); } @@ -109,11 +108,11 @@ public Collection jars() { * Get all binaries. * @return All binaries jars with classes. */ - public List allBinaries() { + public List allBinaries() { return this.all.value() .select(tojos -> true) .stream() - .map(PlacedTojo::new) + .map(TjPlaced::new) .collect(Collectors.toList()); } @@ -122,7 +121,7 @@ public List allBinaries() { * @param dep Dependency identifier. * @return Placed jar. */ - public Optional findJar(final String dep) { + public Optional findJar(final String dep) { return this.jars().stream() .filter(tojo -> tojo.identifier().equals(dep)) .findFirst(); @@ -133,7 +132,7 @@ public Optional findJar(final String dep) { * @param target Path. * @return Placed tojo. */ - public Optional find(final Path target) { + public Optional find(final Path target) { return this.allBinaries().stream().filter( tojo -> target.toString().equals(tojo.identifier()) ).findFirst(); @@ -146,12 +145,12 @@ public Optional find(final Path target) { * @param dep Dependency. * @return Placed class. */ - public PlacedTojo placeClass( + public TjPlaced placeClass( final Path target, final String related, final String dep ) { - return new PlacedTojo( + return new TjPlaced( this.all.value().add(target.toString()) .set(Attribute.KIND.getKey(), "class") .set(Attribute.HASH.getKey(), new FileHash(target)) @@ -176,7 +175,7 @@ public void placeJar(final String name) { * Unplace all tojos. */ public void unplaceAll() { - this.allBinaries().forEach(PlacedTojo::unplace); + this.allBinaries().forEach(TjPlaced::unplace); } /** diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TranspiledTojos.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsTranspiled.java similarity index 94% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TranspiledTojos.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TjsTranspiled.java index e1fc512745..ce4533e336 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TranspiledTojos.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TjsTranspiled.java @@ -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.tojos; +package org.eolang.maven; import com.yegor256.tojos.Tojo; import com.yegor256.tojos.Tojos; @@ -38,7 +38,7 @@ * * @since 0.30 */ -public final class TranspiledTojos implements Closeable { +final class TjsTranspiled implements Closeable { /** * All tojos. @@ -54,7 +54,7 @@ public final class TranspiledTojos implements Closeable { * The main public constructor. * @param tojos Tojos source. */ - public TranspiledTojos(final Sticky tojos) { + TjsTranspiled(final Sticky tojos) { this(new Unchecked<>(tojos)); } @@ -62,7 +62,7 @@ public TranspiledTojos(final Sticky tojos) { * Ctor. * @param tojos Tojos source. */ - TranspiledTojos(final Tojos tojos) { + TjsTranspiled(final Tojos tojos) { this(new Sticky<>(() -> tojos)); } @@ -70,7 +70,7 @@ public TranspiledTojos(final Sticky tojos) { * The main constructor. * @param tojos Tojos source. */ - TranspiledTojos(final Unchecked tojos) { + TjsTranspiled(final Unchecked tojos) { this.all = tojos; this.lock = new Object(); } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TojoHash.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TojoHash.java similarity index 90% rename from eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TojoHash.java rename to eo-maven-plugin/src/main/java/org/eolang/maven/TojoHash.java index 27148be9f2..492e4847a5 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/TojoHash.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TojoHash.java @@ -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.tojos; +package org.eolang.maven; import java.util.function.Supplier; @@ -30,17 +30,17 @@ * Returns tojo hash if exists or empty string otherwise. * @since 0.41 */ -public final class TojoHash implements Supplier { +class TojoHash implements Supplier { /** * Tojo. */ - private final ForeignTojo tojo; + private final TjForeign tojo; /** * Ctor. * @param tjo Foreign tojo */ - public TojoHash(final ForeignTojo tjo) { + TojoHash(final TjForeign tjo) { this.tojo = tjo; } diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java index caa6f1c357..10d35c2ee7 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/TranspileMojo.java @@ -61,8 +61,6 @@ import org.eolang.maven.footprint.FpIgnore; import org.eolang.maven.footprint.FpUpdateBoth; import org.eolang.maven.footprint.FpUpdateFromCache; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.TojoHash; import org.eolang.maven.util.Threaded; import org.eolang.parser.TrFull; @@ -163,7 +161,7 @@ public final class TranspileMojo extends SafeMojo { @Override public void exec() { - final Collection sources = this.scopedTojos().withShaken(); + final Collection sources = this.scopedTojos().withShaken(); final Function transform = this.transpilation(); final int saved = new Threaded<>( sources, @@ -197,7 +195,7 @@ public void exec() { * @throws java.io.IOException If any issues with I/O */ private int transpiled( - final ForeignTojo tojo, + final TjForeign tojo, final Function transform ) throws IOException { final Path source = tojo.shaken(); diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/UnplaceMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/UnplaceMojo.java index 17f7434c12..aef49c36ea 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/UnplaceMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/UnplaceMojo.java @@ -38,7 +38,6 @@ import org.apache.maven.plugins.annotations.Parameter; import org.cactoos.list.ListOf; import org.cactoos.set.SetOf; -import org.eolang.maven.tojos.PlacedTojo; import org.eolang.maven.util.FileHash; /** @@ -94,11 +93,11 @@ public void exec() throws IOException { private void unplaceJars() { final Set used = this.placedTojos.classes() .stream() - .map(PlacedTojo::dependency) + .map(TjPlaced::dependency) .collect(Collectors.toSet()); this.placedTojos.jars().stream() .filter(dep -> used.contains(dep.identifier())) - .forEach(PlacedTojo::unplace); + .forEach(TjPlaced::unplace); } /** @@ -107,7 +106,7 @@ private void unplaceJars() { */ @SuppressWarnings("PMD.AvoidAccessToStaticMembersViaThis") private void unplaceClasses() throws IOException { - final Collection classes = this.placedTojos.classes(); + final Collection classes = this.placedTojos.classes(); int deleted = 0; if (!this.keepBinaries.isEmpty()) { deleted += this.keepThem(classes); @@ -143,9 +142,9 @@ private void unplaceClasses() throws IOException { * @throws IOException If fails */ @SuppressWarnings("PMD.CognitiveComplexity") - private int killThem(final Iterable all) throws IOException { + private int killThem(final Iterable all) throws IOException { int unplaced = 0; - for (final PlacedTojo tojo : all) { + for (final TjPlaced tojo : all) { final String related = tojo.related(); final Path path = Paths.get(tojo.identifier()); final String hash = new FileHash(path).toString(); @@ -198,10 +197,10 @@ private int killThem(final Iterable all) throws IOException { * @throws IOException If fails */ @SuppressWarnings("PMD.AvoidAccessToStaticMembersViaThis") - private int keepThem(final Iterable tojos) throws IOException { + private int keepThem(final Iterable tojos) throws IOException { int deleted = 0; int remained = 0; - for (final PlacedTojo tojo : tojos) { + for (final TjPlaced tojo : tojos) { final String related = tojo.related(); final Path path = Paths.get(tojo.identifier()); if (!this.keepBinaries.isEmpty() diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/package-info.java b/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/package-info.java deleted file mode 100644 index 34fa086713..0000000000 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/dependencies/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Actions with dependencies. - * Represents different behavior with dependencies, depending on use case. - */ -package org.eolang.maven.dependencies; diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/package-info.java b/eo-maven-plugin/src/main/java/org/eolang/maven/hash/package-info.java deleted file mode 100644 index 6c8256bf01..0000000000 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/hash/package-info.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Commit hash package. - * The {@link org.eolang.maven.hash} package contains classes which can help you to - * receive a commit hash from different sources: - * - by HTTP {@link org.eolang.maven.hash.ChRemote} - * - from text or a text file {@link org.eolang.maven.hash.ChText} - * - or by a custom pattern {@link org.eolang.maven.hash.ChPattern} - * Also some implementations can change the hash value itself {@link org.eolang.maven.hash.ChNarrow} - * or even cache invocations to improve the performance of getting a commit hash value - * {@link org.eolang.maven.hash.ChCached}. - */ -package org.eolang.maven.hash; diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/package-info.java b/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/package-info.java deleted file mode 100644 index 232311230e..0000000000 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/package-info.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Package for domain tojos. - * @since 0.30 - * The same way as {@link org.eolang.maven.tojos.TranspiledTojos} we can implement - * - placed tojos - * - foreign tojos - * By that we can achieve grater encapsulation and better readability. - */ -package org.eolang.maven.tojos; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChCachedTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ChCachedTest.java similarity index 96% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChCachedTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/ChCachedTest.java index 3b9ba29e3e..d4b2b02aa6 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChCachedTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ChCachedTest.java @@ -21,10 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; import java.util.concurrent.atomic.AtomicInteger; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChNarrowTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ChNarrowTest.java similarity index 97% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChNarrowTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/ChNarrowTest.java index f8c687b4f5..504fe4126a 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChNarrowTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ChNarrowTest.java @@ -21,9 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChPatternTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ChPatternTest.java similarity index 97% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChPatternTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/ChPatternTest.java index 237222a423..9a36dcd7f9 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChPatternTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ChPatternTest.java @@ -21,9 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChRemoteTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ChRemoteTest.java similarity index 97% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChRemoteTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/ChRemoteTest.java index 6b828e04f9..8a4ad85626 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChRemoteTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ChRemoteTest.java @@ -22,14 +22,13 @@ * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; import com.yegor256.WeAreOnline; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; import org.cactoos.experimental.Threads; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChTextTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ChTextTest.java similarity index 98% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChTextTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/ChTextTest.java index 4523ecf408..79eb9057b6 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/ChTextTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ChTextTest.java @@ -21,14 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.hash; +package org.eolang.maven; import com.yegor256.Mktmp; import com.yegor256.MktmpResolver; import java.io.IOException; import java.nio.file.Path; import org.cactoos.io.ResourceOf; -import org.eolang.maven.CatalogsTest; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesMapTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesMapTest.java similarity index 98% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesMapTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesMapTest.java index 2332d1324d..4ae60ba6bb 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesMapTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesMapTest.java @@ -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.hash; +package org.eolang.maven; import java.util.Map; import org.hamcrest.MatcherAssert; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesTextTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesTextTest.java similarity index 98% rename from eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesTextTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesTextTest.java index efcbe71e4e..c51748c687 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/CommitHashesTextTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/CommitHashesTextTest.java @@ -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.hash; +package org.eolang.maven; import com.yegor256.Together; import com.yegor256.WeAreOnline; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsDepgraphTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsDepgraphTest.java similarity index 97% rename from eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsDepgraphTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/DcsDepgraphTest.java index f7e0404406..293e19308c 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsDepgraphTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsDepgraphTest.java @@ -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.dependencies; +package org.eolang.maven; import com.yegor256.Mktmp; import com.yegor256.MktmpResolver; @@ -30,7 +30,6 @@ import java.nio.file.Paths; import org.cactoos.io.ResourceOf; import org.cactoos.scalar.LengthOf; -import org.eolang.maven.CatalogsTest; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsEachWithoutTransitiveTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsEachWithoutTransitiveTest.java similarity index 97% rename from eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsEachWithoutTransitiveTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/DcsEachWithoutTransitiveTest.java index 1d07d1e999..e58ebd24a4 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsEachWithoutTransitiveTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsEachWithoutTransitiveTest.java @@ -21,13 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.dependencies; +package org.eolang.maven; import java.util.Collections; import java.util.stream.Collectors; import org.apache.maven.model.Dependency; import org.cactoos.list.ListOf; -import org.eolang.maven.CatalogsTest; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsWithRuntimeTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsWithRuntimeTest.java similarity index 96% rename from eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsWithRuntimeTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/DcsWithRuntimeTest.java index e693efcccb..1c56ab627f 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/DcsWithRuntimeTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/DcsWithRuntimeTest.java @@ -21,10 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.dependencies; +package org.eolang.maven; import com.yegor256.WeAreOnline; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java index 1dc39ed39e..1aaad5d538 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java @@ -53,10 +53,6 @@ import org.cactoos.Input; import org.cactoos.text.TextOf; import org.cactoos.text.UncheckedText; -import org.eolang.maven.hash.CommitHash; -import org.eolang.maven.tojos.ForeignTojo; -import org.eolang.maven.tojos.ForeignTojos; -import org.eolang.maven.tojos.PlacedTojos; import org.eolang.maven.util.HmBase; import org.eolang.maven.util.Home; @@ -302,8 +298,8 @@ public Path generatedPath() { * Foreign tojos for eo-foreign.* file. * @return Foreign tojos. */ - ForeignTojos foreignTojos() { - return new ForeignTojos( + TjsForeign foreignTojos() { + return new TjsForeign( () -> Catalogs.INSTANCE.make(this.foreignPath()), this::scope ); @@ -421,8 +417,8 @@ Path foreignPath() { * * @return TjSmart of the current placed.json file. */ - PlacedTojos placed() { - return new PlacedTojos(this.workspace.absolute(Paths.get("placed.json"))); + TjsPlaced placed() { + return new TjsPlaced(this.workspace.absolute(Paths.get("placed.json"))); } /** @@ -449,7 +445,7 @@ Map result() throws IOException { * Retrieve the entry of the last program in the eo-foreign.csv file. * @return Tojo entry. */ - ForeignTojo programTojo() { + TjForeign programTojo() { return this.foreignTojos().find(FakeMaven.tojoId(this.current.get() - 1)); } diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/LintMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/LintMojoTest.java index 17e9a4b5ea..c517dedecd 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/LintMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/LintMojoTest.java @@ -281,9 +281,10 @@ void failsOnWarning(@Mktmp final Path temp) { } @Test - void skipsAlreadyVerified(@Mktmp final Path temp) throws IOException { + void skipsAlreadyLinted(@Mktmp final Path temp) throws IOException { final FakeMaven maven = new FakeMaven(temp) .withHelloWorld() + .allTojosWithHash(CommitHash.FAKE) .execute(new FakeMaven.Lint()); final Path path = maven.result().get( String.format("target/%s/foo/x/main.%s", LintMojo.DIR, AssembleMojo.XMIR) diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/MarkMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/MarkMojoTest.java index 51c123a64a..a1566540e9 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/MarkMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/MarkMojoTest.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.eolang.maven.tojos.ForeignTojos; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -67,7 +66,7 @@ void extendsForeignWithNewObjects(@Mktmp final Path temp) throws IOException { void updatesVersionIfItExists(@Mktmp final Path temp) throws IOException { MarkMojoTest.source(temp); final FakeMaven maven = new FakeMaven(temp); - final ForeignTojos foreign = maven.foreignTojos(); + final TjsForeign foreign = maven.foreignTojos(); foreign.add("foo.bar") .withVersion("*.*.*"); maven.execute(MarkMojo.class); diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/OyRemoteTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/OyRemoteTest.java index fd514547c7..a92cd4ad9d 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/OyRemoteTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/OyRemoteTest.java @@ -27,9 +27,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import org.eolang.maven.hash.ChNarrow; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.CommitHash; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java index 71f3578e9d..31236bf4dc 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ParseMojoTest.java @@ -41,10 +41,6 @@ import org.cactoos.text.TextOf; import org.cactoos.text.UncheckedText; import org.eolang.maven.footprint.FpDefault; -import org.eolang.maven.hash.ChCached; -import org.eolang.maven.hash.ChNarrow; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.CommitHash; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java index 75a81573dc..a8e27b085b 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/ProbeMojoTest.java @@ -30,9 +30,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.cactoos.io.ResourceOf; -import org.eolang.maven.hash.ChCached; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.ChText; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java index 8a87f54711..a6032debce 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java @@ -38,12 +38,6 @@ import org.cactoos.io.ResourceOf; import org.cactoos.text.TextOf; import org.eolang.maven.footprint.Saved; -import org.eolang.maven.hash.ChCached; -import org.eolang.maven.hash.ChNarrow; -import org.eolang.maven.hash.ChPattern; -import org.eolang.maven.hash.ChRemote; -import org.eolang.maven.hash.ChText; -import org.eolang.maven.hash.CommitHash; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/ForeignTojosTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/TjsForeignTest.java similarity index 78% rename from eo-maven-plugin/src/test/java/org/eolang/maven/tojos/ForeignTojosTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/TjsForeignTest.java index b8c7418d5f..a8c16b1b9f 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/ForeignTojosTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/TjsForeignTest.java @@ -21,14 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.eolang.maven.tojos; +package org.eolang.maven; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; import org.cactoos.Func; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; @@ -41,24 +40,24 @@ import org.junit.jupiter.params.provider.MethodSource; /** - * Tests from {@link ForeignTojos}. + * Tests from {@link TjsForeign}. * * @since 0.29.5 */ @SuppressWarnings("PMD.TooManyMethods") -final class ForeignTojosTest { +final class TjsForeignTest { /** * Testable foreign tojos. */ - private ForeignTojos tojos; + private TjsForeign tojos; /** * Set up environment before each test. */ @BeforeEach void setUp() { - this.tojos = new ForeignTojos(); + this.tojos = new TjsForeign(); } @ParameterizedTest @@ -114,9 +113,9 @@ void throwsExceptionIfTojoWasNotFound() { @Test void findsAnyTojoIfSeveralTojosWithTheSameIdWereAdded() { final String same = "same"; - final ForeignTojo first = this.tojos.add(same); - final ForeignTojo second = this.tojos.add(same); - final List expected = Arrays.asList(first, second); + final TjForeign first = this.tojos.add(same); + final TjForeign second = this.tojos.add(same); + final List expected = Arrays.asList(first, second); MatcherAssert.assertThat( "We don't care which tojo will be returned, but it should be one of the added tojos", expected, @@ -128,8 +127,8 @@ void findsAnyTojoIfSeveralTojosWithTheSameIdWereAdded() { @MethodSource("tojoFunctionsWithoutDefaultValues") void throwsExceptionIfKeyWasNotFoundInTojo( final String key, - final Func method) { - final ForeignTojo tojo = this.tojos.add("string"); + final Func method) { + final TjForeign tojo = this.tojos.add("string"); Assertions.assertThrows( AttributeNotFoundException.class, () -> method.apply(tojo), @@ -139,7 +138,7 @@ void throwsExceptionIfKeyWasNotFoundInTojo( @Test void getsExceptionMessageIfKeyWasNotFoundInTojo() { - final ForeignTojo tojo = this.tojos.add("string"); + final TjForeign tojo = this.tojos.add("string"); final AttributeNotFoundException thrown = Assertions.assertThrows( AttributeNotFoundException.class, tojo::shaken @@ -155,9 +154,9 @@ void getsExceptionMessageIfKeyWasNotFoundInTojo() { @MethodSource("tojoFunctionsWithDefaultValues") void doesNotThrowsAnException( final String key, - final Func method + final Func method ) throws Exception { - final ForeignTojo tojo = this.tojos.add("string"); + final TjForeign tojo = this.tojos.add("string"); Assertions.assertEquals( method.apply(tojo), key, @@ -173,21 +172,21 @@ void tearDown() throws IOException { @SuppressWarnings("PMD.UnusedPrivateMethod") private static Stream tojoFunctionsWithoutDefaultValues() { return Stream.of( - Arguments.of("XMIR", (Func) ForeignTojo::xmir), - Arguments.of("SHAKEN", (Func) ForeignTojo::shaken), - Arguments.of("EO", (Func) ForeignTojo::source), - Arguments.of("VERSION", (Func) ForeignTojo::version), - Arguments.of("ID", (Func) ForeignTojo::description), - Arguments.of("HASH", (Func) ForeignTojo::hash), - Arguments.of("PROBED", (Func) ForeignTojo::probed) + Arguments.of("XMIR", (Func) TjForeign::xmir), + Arguments.of("SHAKEN", (Func) TjForeign::shaken), + Arguments.of("EO", (Func) TjForeign::source), + Arguments.of("VERSION", (Func) TjForeign::version), + Arguments.of("ID", (Func) TjForeign::description), + Arguments.of("HASH", (Func) TjForeign::hash), + Arguments.of("PROBED", (Func) TjForeign::probed) ); } @SuppressWarnings("PMD.UnusedPrivateMethod") private static Stream tojoFunctionsWithDefaultValues() { return Stream.of( - Arguments.of("string", (Func) ForeignTojo::identifier), - Arguments.of("compile", (Func) ForeignTojo::scope) + Arguments.of("string", (Func) TjForeign::identifier), + Arguments.of("compile", (Func) TjForeign::scope) ); } } diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/TranspiledTojosTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/TjsTranspiledTest.java similarity index 95% rename from eo-maven-plugin/src/test/java/org/eolang/maven/tojos/TranspiledTojosTest.java rename to eo-maven-plugin/src/test/java/org/eolang/maven/TjsTranspiledTest.java index cd21670df8..8cf0a76541 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/TranspiledTojosTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/TjsTranspiledTest.java @@ -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.tojos; +package org.eolang.maven; import com.yegor256.Mktmp; import com.yegor256.MktmpResolver; @@ -39,7 +39,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eolang.maven.CatalogsTest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; @@ -48,12 +47,12 @@ import org.junit.jupiter.api.extension.ExtendWith; /** - * Tests for {@link TranspiledTojos}. + * Tests for {@link TjsTranspiled}. * * @since 0.30 */ @ExtendWith(MktmpResolver.class) -final class TranspiledTojosTest { +final class TjsTranspiledTest { /** * Transpiled files. @@ -73,7 +72,7 @@ final class TranspiledTojosTest { /** * Testable transpiled tojos. */ - private TranspiledTojos tojos; + private TjsTranspiled tojos; @BeforeEach void setUp(@Mktmp final Path tmp) throws IOException { @@ -91,7 +90,7 @@ void setUp(@Mktmp final Path tmp) throws IOException { ) ) ); - this.tojos = new TranspiledTojos(this.original); + this.tojos = new TjsTranspiled(this.original); } @Test diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/TranspileMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/TranspileMojoTest.java index dd6e30cf27..37278dcf27 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/TranspileMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/TranspileMojoTest.java @@ -238,21 +238,23 @@ void doesNotRetranspileIfNotModified(@Mktmp final Path temp) throws IOException final FakeMaven maven = new FakeMaven(temp); final Path java = maven .withProgram(this.program) + .allTojosWithHash(CommitHash.FAKE) .execute(new FakeMaven.Transpile()) - .result().get(this.compiled); + .result() + .get(this.compiled); MatcherAssert.assertThat( - CatalogsTest.TO_ADD_MESSAGE, + "The .java file must be generated after first transpilation", java.toFile(), FileMatchers.anExistingFile() ); MatcherAssert.assertThat( - CatalogsTest.TO_ADD_MESSAGE, + "The last modified date of generated .java file must be successfully set", java.toFile().setLastModified(0L), Matchers.is(true) ); maven.execute(TranspileMojo.class); MatcherAssert.assertThat( - CatalogsTest.TO_ADD_MESSAGE, + "The .java file must not be regenerated after repeat transpilation", java.toFile().lastModified(), Matchers.is(0L) ); diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceMojoTest.java index e6b185f0a4..dbb8f24645 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/UnplaceMojoTest.java @@ -36,8 +36,6 @@ import java.util.UUID; import java.util.stream.Stream; import org.cactoos.text.TextOf; -import org.eolang.maven.tojos.PlacedTojo; -import org.eolang.maven.tojos.PlacedTojos; import org.eolang.maven.util.HmBase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -94,7 +92,7 @@ void cleansBinariesWithJar(@Mktmp final Path temp) throws IOException { UnplaceMojoTest.placeClass(temp, UnplaceMojoTest.clazz(temp)); UnplaceMojoTest.placeJar(temp, UnplaceMojoTest.DEFAULT_JAR); final Path placed = UnplaceMojoTest.placeClass(temp, UnplaceMojoTest.clazz(temp)); - final List tojos = new PlacedTojos(placed).allBinaries(); + final List tojos = new TjsPlaced(placed).allBinaries(); new FakeMaven(temp) .with("placed", placed.toFile()) .execute(UnplaceMojo.class); @@ -105,7 +103,7 @@ void cleansBinariesWithJar(@Mktmp final Path temp) throws IOException { ); MatcherAssert.assertThat( CatalogsTest.TO_ADD_MESSAGE, - tojos.stream().allMatch(PlacedTojo::unplaced), + tojos.stream().allMatch(TjPlaced::unplaced), Matchers.is(true) ); } @@ -118,7 +116,7 @@ void keepsJarBecauseItIsStillInUse(@Mktmp final Path temp) throws IOException { final String other = "other-jar"; UnplaceMojoTest.placeJar(temp, other); final Path placed = UnplaceMojoTest.placeClass(temp, UnplaceMojoTest.clazz(temp)); - final List tojos = new PlacedTojos(placed).allBinaries(); + final List tojos = new TjsPlaced(placed).allBinaries(); new FakeMaven(temp) .with("placed", placed.toFile()) .execute(UnplaceMojo.class); @@ -131,7 +129,7 @@ void keepsJarBecauseItIsStillInUse(@Mktmp final Path temp) throws IOException { CatalogsTest.TO_ADD_MESSAGE, tojos.stream() .filter(tojo -> tojo.identifier().equals(other)) - .allMatch(PlacedTojo::placed), + .allMatch(TjPlaced::placed), Matchers.is(true) ); } @@ -235,7 +233,7 @@ void unplacesWithRemoveBinaries(@Mktmp final Path temp) throws Exception { */ private static Path placeClass(final Path temp, final Path clazz) { final Path placed = UnplaceMojoTest.placedFile(temp); - new PlacedTojos(placed).placeClass( + new TjsPlaced(placed).placeClass( clazz, temp.relativize(clazz).toString(), UnplaceMojoTest.DEFAULT_JAR @@ -250,7 +248,7 @@ private static Path placeClass(final Path temp, final Path clazz) { * @return Path to the placed tojos file. */ private static void placeJar(final Path temp, final String name) { - new PlacedTojos(UnplaceMojoTest.placedFile(temp)).placeJar(name); + new TjsPlaced(UnplaceMojoTest.placedFile(temp)).placeJar(name); } /** diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/package-info.java b/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/package-info.java deleted file mode 100644 index 830f3e3f81..0000000000 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/dependencies/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Dependencies tests. - * The package contains different unit tests for - * implementations of {@link org.eolang.maven.dependencies}. - */ -package org.eolang.maven.dependencies; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/footprint/FpDefaultTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/footprint/FpDefaultTest.java index fbc21d0d96..5e0e19656f 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/footprint/FpDefaultTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/footprint/FpDefaultTest.java @@ -87,8 +87,8 @@ void doesNothingWhenTargetIsOlderThanSource(@Mktmp final Path temp) throws Excep final Path result = new FpDefault( src -> FpDefaultTest.LAMBDA_CONTENT, temp, - "", - "", + "1.2.3", + "abcdef", Paths.get("") ).apply(source, target); MatcherAssert.assertThat( diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/package-info.java b/eo-maven-plugin/src/test/java/org/eolang/maven/hash/package-info.java deleted file mode 100644 index b803e1dd22..0000000000 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/hash/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Commit hash tests. - * The package contains different unit tests for all - * implementations of {@link org.eolang.maven.hash.CommitHash}. - */ -package org.eolang.maven.hash; diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/package-info.java b/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/package-info.java deleted file mode 100644 index 6111394220..0000000000 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/tojos/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016-2025 Objectionary.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -/** - * Tests for domain tojos. - * @since 0.30 - */ -package org.eolang.maven.tojos; From e3e92dff79c72ce61e9e3e13576c60eefe83d043 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 12 Feb 2025 17:41:03 +0300 Subject: [PATCH 4/4] bug(#3507): public --- .../src/main/java/org/eolang/maven/CommitHashesMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java index 17b4a20ed2..953bb7d0c7 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/CommitHashesMap.java @@ -129,7 +129,7 @@ static final class Fake extends MapEnvelope { /** * Ctor. */ - public Fake() { + Fake() { super(new CommitHashesMap(CommitHashesMap.FAKES)); } }