Fix quality flaw: move (unused, overwritten) methods to concrete class.

Author: DidierBesset

java-squid/src/main/java/org/sonar/java/se/symbolicvalues/BinarySymbolicValue.java

@@ -25,9 +25,6 @@
 import org.sonar.java.se.ObjectConstraint;
 import org.sonar.java.se.ProgramState;
 
-import javax.annotation.CheckForNull;
-
-import java.util.ArrayList;
 import java.util.List;
 
 public abstract class BinarySymbolicValue extends SymbolicValue {
@@ -53,42 +50,6 @@ public void computedFrom(List<SymbolicValue> symbolicValues) {
     leftOp = symbolicValues.get(1);
   }
 
-  @Override
-  public List<ProgramState> setConstraint(ProgramState initialProgramState, BooleanConstraint booleanConstraint) {
-    ProgramState programState = initialProgramState;
-    if (leftOp.equals(rightOp)) {
-      if (shouldNotInverse().equals(booleanConstraint)) {
-        return ImmutableList.of(programState);
-      }
-      return ImmutableList.of();
-    }
-    programState = checkRelation(booleanConstraint, programState);
-    if (programState == null) {
-      return ImmutableList.of();
-    }
-    List<ProgramState> results = new ArrayList<>();
-    List<ProgramState> copiedConstraints = copyConstraint(leftOp, rightOp, programState, booleanConstraint);
-    for (ProgramState ps : copiedConstraints) {
-      List<ProgramState> copiedConstraintsRightToLeft = copyConstraint(rightOp, leftOp, ps, booleanConstraint);
-      if (copiedConstraintsRightToLeft.size() == 1 && copiedConstraintsRightToLeft.get(0).equals(programState)) {
-        results.add(programState.addConstraint(this, booleanConstraint));
-      } else {
-        results.addAll(copiedConstraintsRightToLeft);
-      }
-    }
-    return results;
-  }
-
-  @CheckForNull
-  protected ProgramState checkRelation(BooleanConstraint booleanConstraint, ProgramState programState) {
-    return programState;
-  }
-
-  @Override
-  public String toString() {
-    return "EQ_TO_" + super.toString();
-  }
-
   protected List<ProgramState> copyConstraint(SymbolicValue from, SymbolicValue to, ProgramState programState, BooleanConstraint booleanConstraint) {
     Object constraintLeft = programState.getConstraint(from);
     if (constraintLeft instanceof BooleanConstraint) {

java-squid/src/main/java/org/sonar/java/se/symbolicvalues/RelationalSymbolicValue.java

@@ -19,11 +19,13 @@
  */
 package org.sonar.java.se.symbolicvalues;
 
+import com.google.common.collect.ImmutableList;
 import org.sonar.java.se.ConstraintManager.BooleanConstraint;
 import org.sonar.java.se.ProgramState;
 
 import javax.annotation.CheckForNull;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class RelationalSymbolicValue extends BinarySymbolicValue {
@@ -55,6 +57,32 @@ public BooleanConstraint shouldNotInverse() {
     }
   }
 
+  @Override
+  public List<ProgramState> setConstraint(ProgramState initialProgramState, BooleanConstraint booleanConstraint) {
+    ProgramState programState = initialProgramState;
+    if (leftOp.equals(rightOp)) {
+      if (shouldNotInverse().equals(booleanConstraint)) {
+        return ImmutableList.of(programState);
+      }
+      return ImmutableList.of();
+    }
+    programState = checkRelation(booleanConstraint, programState);
+    if (programState == null) {
+      return ImmutableList.of();
+    }
+    List<ProgramState> results = new ArrayList<>();
+    List<ProgramState> copiedConstraints = copyConstraint(leftOp, rightOp, programState, booleanConstraint);
+    for (ProgramState ps : copiedConstraints) {
+      List<ProgramState> copiedConstraintsRightToLeft = copyConstraint(rightOp, leftOp, ps, booleanConstraint);
+      if (copiedConstraintsRightToLeft.size() == 1 && copiedConstraintsRightToLeft.get(0).equals(programState)) {
+        results.add(programState.addConstraint(this, booleanConstraint));
+      } else {
+        results.addAll(copiedConstraintsRightToLeft);
+      }
+    }
+    return results;
+  }
+
   @Override
   protected List<ProgramState> copyConstraint(SymbolicValue from, SymbolicValue to, ProgramState programState, BooleanConstraint booleanConstraint) {
     ProgramState newState = programState;
@@ -64,9 +92,8 @@ protected List<ProgramState> copyConstraint(SymbolicValue from, SymbolicValue to
     return super.copyConstraint(from, to, newState, booleanConstraint);
   }
 
-  @Override
   @CheckForNull
-  protected ProgramState checkRelation(BooleanConstraint booleanConstraint, ProgramState programState) {
+  private ProgramState checkRelation(BooleanConstraint booleanConstraint, ProgramState programState) {
     RelationState relationState = binaryRelation().resolveState(programState.getKnownRelations());
     if (relationState.rejects(booleanConstraint)) {
       return null;

java-squid/src/test/java/org/sonar/java/se/symbolicvalues/BinaryRelationsTest.java

@@ -643,6 +643,6 @@ public void transitiveConjunction() {
     checkConjunction(LessThanOrEqualRelation.class, NotMethodEqualsRelation.class, LessThanRelation.class, RelationState.FULFILLED);
     checkConjunction(GreaterThanOrEqualRelation.class, NotMethodEqualsRelation.class, GreaterThanRelation.class, RelationState.FULFILLED);
     checkConjunction(GreaterThanOrEqualRelation.class, MethodEqualsRelation.class, EqualRelation.class, RelationState.UNDETERMINED);
-    checkConjunction(NotMethodEqualsRelation.class, NotMethodEqualsRelation.class, EqualRelation.class, RelationState.UNDETERMINED);
+    checkConjunction(NotMethodEqualsRelation.class, NotEqualRelation.class, LessThanRelation.class, RelationState.UNDETERMINED);
   }
 }