Merge branch '__rultor'

qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml

@@ -218,7 +218,6 @@
         <module name="AvoidInlineConditionals"/>
         <module name="CovariantEquals"/>
         <module name="EmptyStatement"/>
-        <module name="EqualsAvoidNull"/>
         <module name="EqualsHashCode"/>
         <module name="FinalLocalVariable"/>
         <module name="HiddenField">

qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java

@@ -704,6 +704,18 @@ public void allowsDiamondOperatorUsage() throws Exception {
         this.runValidation("ValidDiamondsUsage.java", true);
     }
 
+    /**
+     * CheckstyleValidator can allow usage of string literals on either sides.
+     * E.g. both {@code txt.equals("contents")}
+     * and {@code "contents".equals(txt)} are valid.
+     * @throws Exception If error
+     */
+    @Test
+    public void allowsStringLiteralsOnBothSideInComparisons()
+        throws Exception {
+        this.runValidation("ValidLiteralComparisonCheck.java", true);
+    }
+
     /**
      * Convert file name to URL.
      * @param file The file

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

@@ -0,0 +1,34 @@
+/**
+ * Hello.
+ */
+package foo;
+
+/**
+ * Simple.
+ * @author John Smith (john@example.com)
+ * @version $Id$
+ * @since 1.0
+ */
+public final class ValidLiteralComparisonCheck {
+    /**
+     * Some text.
+     */
+    private final String text;
+
+    /**
+     * Constructor.
+     * @param txt Some text.
+     */
+    public ValidLiteralCheck(final String txt) {
+        this.text = txt;
+    }
+
+    /**
+     * Method using input.equals("contents")
+     * instead of "contents".equals(input).
+     */
+    public void validStringComparison() {
+        System.out.println(this.text.equals("contents"));
+        System.out.println("contents".equals(this.text));
+    }
+}