feat(#939): Upgrade eo up to the 0.46.0 version

.github/workflows/maven.test.yaml

@@ -13,7 +13,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-14, windows-2022 ]
-        java: [ 8, 11, 21 ]
+#        We can't use Java 8, because the main dependency https://github.com/objectionary/eo requires at least Java 11
+        java: [ 11, 21 ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

README.md

@@ -17,8 +17,11 @@ optimized performance.
 
 # How to use
 
-The plugin can be run using several approaches but for all of them you need
-at least Maven 3.1.+ and Java 8+.
+The plugin can be run using several approaches, but for all of them, you need at
+least Maven 3.1+ and Java 11+. (Actually, the plugin requires Java 8+, but since
+the main dependency [eo](https://github.com/objectionary/eo) requires Java 11,
+we are obligated to use it as well.)
+
 The plugin can convert compiled classes into EOlang by using
 the `disassemble` goal. The `assemble` goal can convert EOlang back
 into bytecode. The default phase for the plugin
@@ -91,12 +94,13 @@ In order to include debug information in the generated EO files, you can set
 `debug` option.
 
 ```xml
+
 <configuration>
   <mode>debug</mode>
 </configuration>
 ```
 
-This option will add line numbers and local variable names to the EO files 
+This option will add line numbers and local variable names to the EO files
 together with their corresponding labels.
 
 ### Disable bytecode verification
@@ -385,5 +389,5 @@ before sending us your pull request please run full Maven build:
 $ mvn clean install -Pqulice
 ```
 
-You will need [Maven 3.3+](https://maven.apache.org) and Java 8+ installed.
+You will need [Maven 3.3+](https://maven.apache.org) and Java 11+ installed.
 

pom.xml

@@ -120,6 +120,11 @@ SOFTWARE.
       <artifactId>jcabi-manifests</artifactId>
       <!-- version from parent POM -->
     </dependency>
+    <dependency>
+      <groupId>org.eolang</groupId>
+      <artifactId>lints</artifactId>
+      <version>0.0.23</version>
+    </dependency>
     <dependency>
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>
@@ -184,7 +189,7 @@ SOFTWARE.
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>eo-parser</artifactId>
-      <version>0.44.0</version>
+      <version>0.46.0</version>
     </dependency>
     <dependency>
       <groupId>com.github.volodya-lombrozo</groupId>

src/it/annotations/pom.xml

@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>

src/it/bytecode-to-eo/pom.xml

@@ -70,7 +70,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>
@@ -98,7 +98,7 @@ SOFTWARE.
           <plugin>
             <groupId>org.eolang</groupId>
             <artifactId>eo-maven-plugin</artifactId>
-            <version>0.44.0</version>
+            <version>0.46.0</version>
             <executions>
               <execution>
                 <id>convert-xmir-to-eo</id>

src/it/custom-transformations/pom.xml

@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <!--
             @todo #610:30min Enable EO Printing in 'custom-transformations' it.

src/it/exceptions/pom.xml

@@ -82,7 +82,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>

src/it/generics/pom.xml

@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>

src/it/jna/pom.xml

@@ -219,7 +219,7 @@ SOFTWARE.
           <plugin>
             <groupId>org.eolang</groupId>
             <artifactId>eo-maven-plugin</artifactId>
-            <version>0.44.0</version>
+            <version>0.46.0</version>
             <executions>
               <execution>
                 <id>xmir-to-phi</id>

src/it/phi-unphi/pom.xml

@@ -89,7 +89,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>xmir-to-phi</id>

src/it/spring/pom.xml

@@ -84,7 +84,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>

src/it/spring/verify.groovy

@@ -32,10 +32,7 @@ def app = new File(basedir, 'target/generated-sources/jeo-xmir/org/eolang/jeo/sp
 assert app.exists()
 assert app.text.contains("metas")
 assert app.text.contains("<head>package</head>")
-// Check that we have "opcode" and "label" imports where they are needed
-assert app.text.contains("<tail>jeo.opcode.return</tail>")
 //Check that if class doesn't have instructions, it doesn't have "opcode" imports.
 def empty = new File(basedir, 'target/generated-sources/jeo-xmir/org/eolang/jeo/spring/WithoutInstructions.xmir')
 assert empty.exists()
-assert !empty.text.contains("<tail>jeo.opcode.return</tail>")
 true

src/it/takes/pom.xml

@@ -80,7 +80,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>

src/main/java/org/eolang/jeo/representation/CanonicalXmir.java

@@ -39,7 +39,7 @@
 import java.nio.file.Path;
 import org.cactoos.io.InputOf;
 import org.eolang.parser.EoSyntax;
-import org.eolang.parser.xmir.Xmir;
+import org.eolang.parser.Xmir;
 
 /**
  * Canonical XMIR.
@@ -109,7 +109,7 @@ public XML plain() {
      * @return EO.
      */
     private String toEo() {
-        return new Xmir.Default(this.canonical).toEO();
+        return new Xmir(this.canonical).toEO();
     }
 
     /**
@@ -147,17 +147,17 @@ private static XML unroll(final XML parsed) {
         return new Xsline(
             new TrFast(
                 new TrJoined<Shift>(
-                    new TrClasspath<Shift>(
+                    new TrClasspath<>(
                         "/org/eolang/parser/wrap-method-calls.xsl"
                     ).back(),
-                    new TrDefault<Shift>(
+                    new TrDefault<>(
                         new StEndless(
                             new StClasspath(
                                 "/org/eolang/parser/roll-bases.xsl"
                             )
                         )
                     ),
-                    new TrClasspath<Shift>(
+                    new TrClasspath<>(
                         "/org/eolang/parser/add-refs.xsl",
                         "/org/eolang/parser/add-cuts.xsl"
                     ).back(),
@@ -169,7 +169,9 @@ private static XML unroll(final XML parsed) {
                         )
                     ),
                     new TrClasspath<Shift>(
-                        "/org/eolang/parser/remove-cuts.xsl"
+                        "/org/eolang/parser/remove-cuts.xsl",
+                        "/org/eolang/parser/add-default-package.xsl",
+                        "/org/eolang/parser/explicit-data.xsl"
                     ).back()
                 ),
                 CanonicalXmir.class,

src/main/java/org/eolang/jeo/representation/VerifiedEo.java

@@ -23,9 +23,15 @@
  */
 package org.eolang.jeo.representation;
 
+import com.jcabi.xml.StrictXML;
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
-import org.eolang.parser.Schema;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import org.eolang.lints.Defect;
+import org.eolang.lints.Program;
+import org.eolang.lints.Severity;
 import org.xembly.Directive;
 import org.xembly.ImpossibleModificationException;
 import org.xembly.Xembler;
@@ -55,11 +61,32 @@ final class VerifiedEo {
      * We also check if the EO is correct.
      * @return XML representation.
      * @throws ImpossibleModificationException If something goes wrong.
+     * @todo #939:60min Fix All The Warnings in the EO Representation.
+     *  Here we just catch only the errors in the EO representation.
+     *  We need to fix all the warnings in the EO representation as well.
      */
     XML asXml() throws ImpossibleModificationException {
         final XML res = new XMLDocument(new Xembler(this.directives).xml());
-        new Schema(res).check();
+        try {
+            final Collection<Defect> defects = new Program(new StrictXML(res)).defects()
+                .stream()
+                .filter(defect -> defect.severity() == Severity.ERROR)
+                .collect(Collectors.toList());
+            if (!defects.isEmpty()) {
+                throw new IllegalStateException(
+                    String.format(
+                        "EO is incorrect: %s, %n%s%n",
+                        defects,
+                        res
+                    )
+                );
+            }
+        } catch (final IOException exception) {
+            throw new IllegalStateException(
+                String.format("Failed to verify EO: %n%s%n", res),
+                exception
+            );
+        }
         return res;
     }
-
 }

src/main/java/org/eolang/jeo/representation/XmirRepresentation.java

@@ -23,28 +23,23 @@
  */
 package org.eolang.jeo.representation;
 
+import com.jcabi.xml.StrictXML;
 import com.jcabi.xml.XML;
+import com.jcabi.xml.XMLDocument;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.SchemaFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import org.cactoos.io.ResourceOf;
-import org.cactoos.io.UncheckedInput;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.Synced;
 import org.cactoos.scalar.Unchecked;
 import org.eolang.jeo.representation.bytecode.Bytecode;
 import org.eolang.jeo.representation.xmir.XmlProgram;
 import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
 
 /**
  * Intermediate representation of a class files from XMIR.
@@ -155,7 +150,7 @@ public String name() {
     public Bytecode toBytecode() {
         final Node xmir = this.xml.value();
         try {
-            new OptimizedSchema(xmir).check();
+            new StrictXML(new XMLDocument(new XMLDocument(xmir).toString())).validate();
             return new XmlProgram(xmir).bytecode().bytecode();
         } catch (final IllegalArgumentException exception) {
             throw new IllegalArgumentException(
@@ -207,63 +202,4 @@ private static Node open(final Path path) {
             );
         }
     }
-
-    /**
-     * Optimized schema for XMIR.
-     * It is an optimized version of {@link org.eolang.parser.Schema} class.
-     * @since 0.6
-     * @todo #889:30min Use the `Schema` class instead of `OptimizedSchema`.
-     *  The `OptimizedSchema` class is a temporary solution to avoid the performance
-     *  issues with the `Schema` class. We will be able to remove this class after
-     *  the following issue is resolved:
-     *  https://github.com/jcabi/jcabi-xml/issues/277
-     */
-    private static class OptimizedSchema {
-        /**
-         * Node.
-         */
-        private final Node node;
-
-        /**
-         * Schema factory.
-         */
-        private final SchemaFactory factory;
-
-        /**
-         * Constructor.
-         * @param node Node.
-         */
-        OptimizedSchema(final Node node) {
-            this(node, SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"));
-        }
-
-        /**
-         * Constructor.
-         * @param node Node.
-         * @param factory Schema factory.
-         */
-        private OptimizedSchema(final Node node, final SchemaFactory factory) {
-            this.node = node;
-            this.factory = factory;
-        }
-
-        /**
-         * Check the node.
-         */
-        void check() {
-            try {
-                this.factory.newSchema(
-                    new StreamSource(new UncheckedInput(new ResourceOf("XMIR.xsd")).stream())
-                ).newValidator().validate(new DOMSource(this.node));
-            } catch (final IOException | SAXException exception) {
-                throw new IllegalStateException(
-                    String.format(
-                        "There are XSD violations, see the log",
-                        exception.getMessage()
-                    ),
-                    exception
-                );
-            }
-        }
-    }
 }

src/main/java/org/eolang/jeo/representation/bytecode/BytecodeProgram.java

@@ -154,10 +154,7 @@ public DirectivesProgram directives(final String listing) {
         return new DirectivesProgram(
             listing,
             clazz,
-            new DirectivesMetas(
-                classname,
-                clazz
-            )
+            new DirectivesMetas(classname)
         );
     }
 }