Merge pull request #47 from DevFactory/release/conflicting-field-names-with-method-names-fix-1

Code quality fix - Methods and field names should not be the same or differ only by capitalization.

Author: joshsh

common/src/main/java/net/fortytwo/sesametools/ContextInsensitiveStatementComparator.java

@@ -12,19 +12,19 @@
  */
 public class ContextInsensitiveStatementComparator implements Comparator<Statement> {
     public final static int BEFORE = -1;
-    public final static int EQUALS = 0;
+    public final static int EQUAL = 0;
     public final static int AFTER = 1;
 
     @Override
     public int compare(Statement first, Statement second) {
         if (first == second) {
-            return EQUALS;
+            return EQUAL;
         }
 
         if (first.getSubject().equals(second.getSubject())) {
             if (first.getPredicate().equals(second.getPredicate())) {
                 if (first.getObject().equals(second.getObject())) {
-                    return EQUALS;
+                    return EQUAL;
                 } else {
                     return ValueComparator.getInstance().compare(first.getObject(), second.getObject());
                 }

common/src/main/java/net/fortytwo/sesametools/StatementComparator.java

@@ -24,15 +24,15 @@ public static StatementComparator getInstance() {
     }
 
     public final static int BEFORE = -1;
-    public final static int EQUALS = 0;
+    public final static int EQUAL = 0;
     public final static int AFTER = 1;
 
     @Override
     public int compare(Statement first, Statement second) {
         // Cannot use Statement.equals as it does not take Context into account,
         // but can check for reference equality (==)
         if (first == second) {
-            return EQUALS;
+            return EQUAL;
         }
 
         if (first.getSubject().equals(second.getSubject())) {
@@ -41,7 +41,7 @@ public int compare(Statement first, Statement second) {
                     // Context is the only part of a statement that should legitimately be null
                     if (first.getContext() == null) {
                         if (second.getContext() == null) {
-                            return EQUALS;
+                            return EQUAL;
                         } else {
                             return BEFORE;
                         }

common/src/main/java/net/fortytwo/sesametools/ValueComparator.java

@@ -36,7 +36,7 @@ public static ValueComparator getInstance() {
     }
 
     public final static int BEFORE = -1;
-    public final static int EQUALS = 0;
+    public final static int EQUAL = 0;
     public final static int AFTER = 1;
 
     /**
@@ -57,7 +57,7 @@ public static ValueComparator getInstance() {
     public int compare(Value first, Value second) {
         if (first == null) {
             if (second == null) {
-                return EQUALS;
+                return EQUAL;
             } else {
                 return BEFORE;
             }
@@ -68,7 +68,7 @@ public int compare(Value first, Value second) {
         }
 
         if (first == second || first.equals(second)) {
-            return EQUALS;
+            return EQUAL;
         }
 
         if (first instanceof BNode) {
@@ -100,7 +100,7 @@ public int compare(Value first, Value second) {
             Literal secondLiteral = (Literal) second;
             int cmp = firstLiteral.getLabel().compareTo(secondLiteral.getLabel());
 
-            if (EQUALS == cmp) {
+            if (EQUAL == cmp) {
                 Optional<String> firstLang = firstLiteral.getLanguage();
                 Optional<String> secondLang = secondLiteral.getLanguage();
                 if (firstLang.isPresent()) {
@@ -117,7 +117,7 @@ public int compare(Value first, Value second) {
                 IRI secondType = secondLiteral.getDatatype();
                 if (null == firstType) {
                     if (null == secondType) {
-                        return EQUALS;
+                        return EQUAL;
                     } else {
                         return BEFORE;
                     }

common/src/test/java/net/fortytwo/sesametools/StatementComparatorTest.java

@@ -173,7 +173,7 @@ public void tearDown() throws Exception {
      */
     @Test
     public void testStatementComparatorConstants() {
-        assertEquals(0, StatementComparator.EQUALS);
+        assertEquals(0, StatementComparator.EQUAL);
         assertTrue(StatementComparator.BEFORE < 0);
         assertTrue(StatementComparator.AFTER > 0);
     }