Merge branch 'master' into fix/typos

Author: saleemasekrea000

README.md

@@ -1,4 +1,6 @@
-<img alt="logo" src="https://www.qulice.com/logo.svg" width="200px" height="55px"/>
+# Qulice
+
+![logo](https://www.qulice.com/logo.svg)
 
 [![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org)
 [![DevOps By Rultor.com](https://www.rultor.com/b/yegor256/qulice)](https://www.rultor.com/p/yegor256/qulice)
@@ -72,7 +74,7 @@ they don't violate our quality standards. To avoid frustration, before
 sending us your pull request please run full Maven build:
 
 ```bash
-$ mvn clean install -Pqulice
+mvn clean install -Pqulice
 ```
 
 Keep in mind that JDK 11+ and Maven 3.8+ are the lowest versions you may use.

qulice-checkstyle/src/main/java/com/qulice/checkstyle/MethodsOrderCheck.java

@@ -198,11 +198,11 @@ private enum Modifiers {
 
         /**
          * Constructor.
-         * @param typ TokenType of DetailAST which represents modifier
+         * @param type TokenType of DetailAST which represents modifier
          * @param ord Order of the modifier in class definition
          */
-        Modifiers(final Integer typ, final Integer ord) {
-            this.type = typ;
+        Modifiers(final Integer type, final Integer ord) {
+            this.type = type;
             this.order = ord;
         }
 

qulice-checkstyle/src/main/java/com/qulice/checkstyle/parameters/Parameters.java

@@ -29,23 +29,23 @@ public class Parameters {
     private final int parent;
 
     /**
-     * Childs TokenType (TYPE_PARAMETER or PARAMETER_DEF).
+     * Children TokenType (TYPE_PARAMETER or PARAMETER_DEF).
      * @see com.puppycrawl.tools.checkstyle.api.TokenTypes
      */
-    private final int childs;
+    private final int children;
 
     /**
      * Primary ctor.
      * @param node Class, interface, constructor or method definition node.
      * @param parent Parent TokenType (TYPE_PARAMETERS or PARAMETERS).
-     * @param childs Childs TokenType (TYPE_PARAMETER or PARAMETER_DEF).
+     * @param children Children TokenType (TYPE_PARAMETER or PARAMETER_DEF).
      */
     public Parameters(
-        final DetailAST node, final int parent, final int childs
+        final DetailAST node, final int parent, final int children
     ) {
         this.node = node;
         this.parent = parent;
-        this.childs = childs;
+        this.children = children;
     }
 
     /**
@@ -58,7 +58,7 @@ public final int count() {
         if (params == null) {
             result = 0;
         } else {
-            result = params.getChildCount(this.childs);
+            result = params.getChildCount(this.children);
         }
         return result;
     }
@@ -77,7 +77,7 @@ public final List<DetailAST> parameters() {
             result = new ArrayList<>(count);
             DetailAST child = params.getFirstChild();
             while (child != null) {
-                if (child.getType() == this.childs) {
+                if (child.getType() == this.children) {
                     result.add(child);
                 }
                 child = child.getNextSibling();

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/NonStaticMethodCheck/Invalid.java

@@ -11,7 +11,7 @@ public String name() {
     }
     @Deprecated
     public String name() {
-        return "method with non-overide annotation";
+        return "method with non-override annotation";
     }
     public synchronized String name() {
         return "method with non-native and non-abstract modifier";

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ValidSingleLineCommentCheck.java

@@ -20,7 +20,7 @@ public final class ValidSingleLineCommentCheck {
      */
     public static final String ANOTHER_LITERAL = "/**/";
 
-    /** Valid sinle line literal. */
+    /** Valid single line literal. */
     public static final String SINGLE_LINE_LITERAL = "/**   this is not comment  **/";
 
     /**

qulice-maven-plugin/src/it/pmd-violations/src/main/java/com/qulice/foo/Violations.java

@@ -68,10 +68,10 @@ private static final class Foo {
 
         /**
          * Constructor.
-         * @param nam Name.
+         * @param name Name.
          */
-        Foo(final String nam) {
-            this.name = nam;
+        Foo(final String name) {
+            this.name = name;
         }
 
         @Override

qulice-maven-plugin/src/main/java/com/qulice/maven/AbstractQuliceMojo.java

@@ -98,11 +98,11 @@ public final void setSkip(final boolean skp) {
 
     /**
      * Set asserts option.
-     * @param asser Asserts to use.
+     * @param val Asserts to use.
      */
-    public final void setAsserts(final Collection<String> asser) {
+    public final void setAsserts(final Collection<String> val) {
         this.asserts.clear();
-        this.asserts.addAll(asser);
+        this.asserts.addAll(val);
     }
 
     /**
@@ -139,7 +139,7 @@ public final void execute() throws MojoFailureException {
             new MojoExecutor(this.manager, this.sess)
         );
         this.environment.setExcludes(this.excludes);
-        this.environment.setAsser(this.asserts);
+        this.environment.setAssertion(this.asserts);
         this.environment.setEncoding(this.charset);
         final long start = System.nanoTime();
         this.doExecute();

qulice-maven-plugin/src/main/java/com/qulice/maven/DefaultMavenEnvironment.java

@@ -69,7 +69,7 @@ public final class DefaultMavenEnvironment implements MavenEnvironment {
     /**
      * Xpath queries for pom.xml validation.
      */
-    private final Collection<String> asser = new LinkedList<>();
+    private final Collection<String> assertion = new LinkedList<>();
 
     /**
      * Source code encoding charset.
@@ -178,7 +178,7 @@ public MojoExecutor executor() {
 
     @Override
     public Collection<String> asserts() {
-        return this.asser;
+        return this.assertion;
     }
 
     @Override
@@ -267,9 +267,9 @@ public void setExcludes(final Collection<String> exprs) {
      * Set list of Xpath queries for pom.xml validation.
      * @param ass Xpath queries
      */
-    public void setAsser(final Collection<String> ass) {
-        this.asser.clear();
-        this.asser.addAll(ass);
+    public void setAssertion(final Collection<String> ass) {
+        this.assertion.clear();
+        this.assertion.addAll(ass);
     }
 
     public void setEncoding(final String encoding) {

qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml

@@ -212,7 +212,7 @@
     <priority>3</priority>
     <properties>
       <property name="version" value="2.0"/>
-      <!--Solve priority confict-->
+      <!--Solve priority conflict-->
       <property name="xpath">
         <value><![CDATA[
         //TypeDeclaration

qulice-pmd/src/test/resources/com/qulice/pmd/CallToConstructorInConstructor.java

@@ -22,7 +22,7 @@ public int num() {
         return number;
     }
 
-    public int anothe() {
+    public int getAnother() {
         return another;
     }
 }