build(#4884): upgrade qulice to version 0.25.1 in eo-maven-plugin

eo-maven-plugin/pom.xml

@@ -519,6 +519,7 @@
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
+            <version>0.25.1</version>
             <configuration>
               <excludes>
                 <exclude>checkstyle:/src/it.*</exclude>

eo-maven-plugin/src/main/java/org/eolang/maven/Cache.java

@@ -5,6 +5,7 @@
 package org.eolang.maven;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
@@ -101,16 +102,15 @@ private Path hash(final Path tail) {
      */
     private static String sha(final Path file) throws NoSuchAlgorithmException, IOException {
         final MessageDigest digest = MessageDigest.getInstance("SHA-256");
-        try (var stream = Files.newInputStream(file)) {
+        try (InputStream stream = Files.newInputStream(file)) {
             final byte[] buffer = new byte[8192];
             int read = stream.read(buffer);
             while (read != -1) {
                 digest.update(buffer, 0, read);
                 read = stream.read(buffer);
             }
         }
-        final byte[] hash = digest.digest();
-        return Base64.getEncoder().encodeToString(hash);
+        return Base64.getEncoder().encodeToString(digest.digest());
     }
 }
 

eo-maven-plugin/src/main/java/org/eolang/maven/Catalogs.java

@@ -15,6 +15,7 @@
 import com.yegor256.tojos.Tojos;
 import java.nio.file.Path;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.Unchecked;
@@ -23,7 +24,11 @@
  * All catalogs in one place, to avoid making multiple objects.
  *
  * @since 0.29
+ * @todo #4884:30min Use ReentranLock instead of synchronized block in the code.
+ *  It will be more efficient and will not cause deadlocks.
+ *  Don't forget to remove the PMD suppression after that.
  */
+@SuppressWarnings("PMD.AvoidSynchronizedStatement")
 final class Catalogs {
 
     /**
@@ -54,7 +59,7 @@ final class Catalogs {
     /**
      * All of them.
      */
-    private final ConcurrentHashMap<Path, Tojos> all;
+    private final Map<Path, Tojos> all;
 
     /**
      * Ctor.

eo-maven-plugin/src/main/java/org/eolang/maven/ChSource.java

@@ -79,11 +79,15 @@ public String value() {
      * @return SHA-1 hash
      * @throws NoSuchAlgorithmException If SHA-1 is not supported
      */
+    @SuppressWarnings("PMD.UseStringIsEmptyRule")
     private String hash() throws NoSuchAlgorithmException {
         final MessageDigest digest = MessageDigest.getInstance("SHA-1");
-        final var content = new Unchecked<>(this.text).value();
         final StringBuilder res = new StringBuilder(40);
-        for (final byte raw : digest.digest(content.getBytes(StandardCharsets.UTF_8))) {
+        for (
+            final byte raw : digest.digest(
+                new Unchecked<>(this.text).value().getBytes(StandardCharsets.UTF_8)
+            )
+        ) {
             final String hex = Integer.toHexString(0xff & raw);
             if (hex.length() == 1) {
                 res.append('0');

eo-maven-plugin/src/main/java/org/eolang/maven/CommitHash.java

@@ -18,11 +18,7 @@ interface CommitHash extends Scalar<String> {
      */
     CommitHash FAKE = new CommitHash.ChConstant("abcdef");
 
-    /**
-     * SHA Hash.
-     *
-     * @return SHA of commit
-     */
+    @Override
     String value();
 
     /**

eo-maven-plugin/src/main/java/org/eolang/maven/ConcurrentCache.java

@@ -12,7 +12,12 @@
  * Concurrent cache wrapper for Cache.
  * Wrap {@link Cache} to make it thread-safe.
  * @since 0.60
+ * @todo #4884:30min Use ReentrantLock instead of synchronized block.
+ *  This is the suggestion from qulice.
+ *  Dont' forget to remove the PMD suppression for AvoidSynchronizedStatement
+ *  after that.
  */
+@SuppressWarnings("PMD.AvoidSynchronizedStatement")
 final class ConcurrentCache {
 
     /**

eo-maven-plugin/src/main/java/org/eolang/maven/DepDirs.java

@@ -45,6 +45,7 @@ final class DepDirs extends ListEnvelope<String> {
      * @return List
      * @throws IOException If fails
      */
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     private static List<String> list(final Path dir) throws IOException {
         final List<String> names = new LinkedList<>();
         if (Files.exists(dir)) {

eo-maven-plugin/src/main/java/org/eolang/maven/Dependencies.java

@@ -17,6 +17,7 @@
  * List of dependencies.
  * @since 0.54
  */
+@FunctionalInterface
 interface Dependencies extends Iterable<Dep> {
     /**
      * Fake dependencies.
@@ -106,14 +107,11 @@ static Dep runtimeDep() {
          */
         private static Dep randDep() {
             final Random rand = new SecureRandom();
-            final String scope = new String[] {
-                "test", "compiled", "runtime",
-            }[rand.nextInt(3)];
             return Dependencies.Fake.dep(
                 UUID.randomUUID().toString(),
                 UUID.randomUUID().toString(),
                 String.valueOf(rand.nextInt(Integer.MAX_VALUE)),
-                scope
+                    new String[]{"test", "compiled", "runtime"}[rand.nextInt(3)]
             );
         }
 
@@ -126,7 +124,6 @@ private static Dep randDep() {
          * @return Dependency.
          * @checkstyle ParameterNumberCheck (5 lines)
          */
-        @SuppressWarnings("PMD.UseObjectForClearerAPI")
         private static Dep dep(
             final String group,
             final String artifact,

eo-maven-plugin/src/main/java/org/eolang/maven/DpsDefault.java

@@ -156,12 +156,10 @@ private static Collection<String> jvms(final Path file) {
                         Filter.withName("meta"),
                         meta -> {
                             final Xnav xnav = new Xnav(meta);
-                            final Optional<String> head = xnav.element("head").text();
-                            final boolean runtime = head.map("rt"::equals).orElse(false);
                             final Optional<Xnav> part = xnav.elements(
                                 Filter.withName("part")
                             ).findFirst();
-                            return runtime
+                            return xnav.element("head").text().map("rt"::equals).orElse(false)
                                 && part.isPresent()
                                 && part.get().text().map("jvm"::equals).orElse(false);
                         }

eo-maven-plugin/src/main/java/org/eolang/maven/DpsEachWithoutTransitive.java

@@ -45,18 +45,20 @@ final class DpsEachWithoutTransitive implements Dependencies {
     public Iterator<Dep> iterator() {
         return new Mapped<>(
             dependency -> {
-                final Iterable<Dep> transitives = new Filtered<>(
-                    dep -> {
-                        final Dependency dpndncy = dep.get();
-                        return !DpsEachWithoutTransitive.eqTo(dpndncy, dependency.get())
-                            && DpsEachWithoutTransitive.isRuntimeRequired(dpndncy)
-                            && !MjResolve.isRuntime(dpndncy);
-                    },
-                    this.transitive.apply(dependency)
-                );
                 final String list = String.join(
                     ", ",
-                    new Mapped<>(Dep::toString, transitives)
+                    new Mapped<>(
+                        Dep::toString,
+                        new Filtered<>(
+                            dep -> {
+                                final Dependency dpndncy = dep.get();
+                                return !DpsEachWithoutTransitive.eqTo(dpndncy, dependency.get())
+                                    && DpsEachWithoutTransitive.isRuntimeRequired(dpndncy)
+                                    && !MjResolve.isRuntime(dpndncy);
+                            },
+                            this.transitive.apply(dependency)
+                        )
+                    )
                 );
                 if (!list.isEmpty()) {
                     throw new IllegalStateException(

eo-maven-plugin/src/main/java/org/eolang/maven/DpsWithRuntime.java

@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import org.apache.maven.model.Dependency;
@@ -78,7 +79,7 @@ final class DpsWithRuntime implements Dependencies {
 
     @Override
     public Iterator<Dep> iterator() {
-        final ListOf<Dep> all = new ListOf<>(this.delegate);
+        final List<Dep> all = new ListOf<>(this.delegate);
         if (all.stream().noneMatch(dep -> DpsWithRuntime.isRuntime(dep.get()))) {
             all.add(this.supplied.value());
         }

eo-maven-plugin/src/main/java/org/eolang/maven/Footprint.java

@@ -13,6 +13,7 @@
  * target files, updates target file and returns it.
  * @since 0.41.0
  */
+@FunctionalInterface
 interface Footprint extends BiFunc<Path, Path, Path> {
     @Override
     Path apply(Path source, Path target) throws IOException;

eo-maven-plugin/src/main/java/org/eolang/maven/MjAssemble.java

@@ -46,6 +46,7 @@ public final class MjAssemble extends MjSafe {
     };
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     public void exec() {
         final long begin = System.currentTimeMillis();
         String before = this.scopedTojos().status();

eo-maven-plugin/src/main/java/org/eolang/maven/MjCompile.java

@@ -38,6 +38,7 @@ public final class MjCompile extends MjSafe {
     };
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     public void exec() {
         final long begin = System.currentTimeMillis();
         for (final Moja<?> moja : MjCompile.MOJAS) {

eo-maven-plugin/src/main/java/org/eolang/maven/MjLint.java

@@ -77,10 +77,11 @@ void exec() throws IOException {
      * Lint.
      * @throws IOException If fails
      */
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     private void lint() throws IOException {
         final long start = System.currentTimeMillis();
         final Collection<TjForeign> tojos = this.scopedTojos().withXmir();
-        final ConcurrentHashMap<Severity, Integer> counts = new ConcurrentHashMap<>();
+        final Map<Severity, Integer> counts = new ConcurrentHashMap<>();
         counts.putIfAbsent(Severity.CRITICAL, 0);
         counts.putIfAbsent(Severity.ERROR, 0);
         counts.putIfAbsent(Severity.WARNING, 0);
@@ -143,7 +144,7 @@ private void lint() throws IOException {
      */
     private int lintOne(
         final TjForeign tojo,
-        final ConcurrentHashMap<Severity, Integer> counts,
+        final Map<Severity, Integer> counts,
         final String... unlints
     ) throws Exception {
         final Path source = tojo.xmir();
@@ -185,7 +186,7 @@ private int lintOne(
      * @return Amount of seen XMIR files
      * @throws IOException If failed to lint
      */
-    private int lintAll(final ConcurrentHashMap<Severity, Integer> counts) throws IOException {
+    private int lintAll(final Map<Severity, Integer> counts) throws IOException {
         final Map<String, Path> paths = new HashMap<>();
         for (final TjForeign tojo : this.scopedTojos().withXmir()) {
             paths.put(tojo.identifier(), tojo.xmir());
@@ -235,7 +236,7 @@ private int lintAll(final ConcurrentHashMap<Severity, Integer> counts) throws IO
     private XML linted(
         final String program,
         final XML xmir,
-        final ConcurrentHashMap<Severity, Integer> counts,
+        final Map<Severity, Integer> counts,
         final String... unlints
     ) {
         final Node node = xmir.inner();
@@ -317,7 +318,7 @@ private static String plural(final int count, final String name) {
      * @param counts Counts of errors, warnings, and critical
      * @return Summary text
      */
-    private static String summary(final ConcurrentHashMap<Severity, Integer> counts) {
+    private static String summary(final Map<Severity, Integer> counts) {
         final List<String> parts = new ArrayList<>(0);
         final int critical = counts.get(Severity.CRITICAL);
         if (critical > 0) {

eo-maven-plugin/src/main/java/org/eolang/maven/MjParse.java

@@ -63,6 +63,7 @@ public final class MjParse extends MjSafe {
     static final String CACHE = "parsed";
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     public void exec() {
         final long start = System.currentTimeMillis();
         final Collection<TjForeign> tojos = this.scopedTojos().withSources();

eo-maven-plugin/src/main/java/org/eolang/maven/MjPrint.java

@@ -65,10 +65,12 @@ void exec() throws IOException {
                     this.printSourcesDir.toPath().relativize(source).toString()
                         .replace(".xmir", ".eo")
                 );
-                final String program = new Xmir(
-                    new XMLDocument(new TextOf(source).asString())
-                ).toEO();
-                new Saved(program, home.resolve(relative)).value();
+                new Saved(
+                    new Xmir(
+                        new XMLDocument(new TextOf(source).asString())
+                    ).toEO(),
+                    home.resolve(relative)
+                ).value();
                 Logger.info(
                     this,
                     "Printed: %[file]s (%[size]s) => %[file]s (%[size]s)",

eo-maven-plugin/src/main/java/org/eolang/maven/MjProbe.java

@@ -52,6 +52,7 @@ public void exec() throws IOException {
     /**
      * Probe objects.
      */
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     private void probe() {
         final Collection<TjForeign> tojos = this.scopedTojos().unprobed();
         if (tojos.isEmpty()) {

eo-maven-plugin/src/main/java/org/eolang/maven/MjPull.java

@@ -41,16 +41,17 @@ public final class MjPull extends MjSafe {
 
     @Override
     public void exec() throws IOException {
-        final var objectionary = new OyIndexed(
-            new OyCached(new OyRemote(this.hash, this.proxies()))
-        );
         if (this.offline) {
             Logger.info(
                 this,
                 "No programs were pulled because eo.offline flag is TRUE"
             );
         } else {
-            this.pull(objectionary);
+            this.pull(
+                new OyIndexed(
+                    new OyCached(new OyRemote(this.hash, this.proxies()))
+                )
+            );
         }
     }
 
@@ -59,7 +60,7 @@ public void exec() throws IOException {
      * @param objectionary Objectionary to pull from
      * @throws IOException If fails
      */
-    @SuppressWarnings("PMD.PrematureDeclaration")
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     private void pull(final OyIndexed objectionary) throws IOException {
         final long start = System.currentTimeMillis();
         final Collection<TjForeign> tojos = this.scopedTojos().withoutSources();
@@ -116,11 +117,10 @@ private Path pulled(
         final String object,
         final Path base,
         final String hsh) throws IOException {
-        final String semver = this.plugin.getVersion();
         final Path target = new Place(object).make(base, MjAssemble.EO);
         final Supplier<Path> che = new CachePath(
             this.cache.toPath().resolve(MjPull.CACHE),
-            semver,
+            this.plugin.getVersion(),
             hsh,
             base.relativize(target)
         );