Author: bleny Date: 2010-08-03 11:29:14 +0200 (Tue, 03 Aug 2010) New Revision: 216 Url: http://nuiton.org/repositories/revision/wikitty/216 Log: #698 using constant hashCode in search Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-08-03 09:29:14 UTC (rev 216) @@ -75,18 +75,18 @@ if ((restrictions == null && and.getRestrictions() != null) || (restrictions != null && !restrictions.equals(and - .getRestrictions()))) + .getRestrictions()))) { return false; + } return true; } public int hashCode() { - int result = And.class.getName().hashCode(); - if (restrictions != null) { - result = 29 * result + restrictions.hashCode(); - } - return result; + // equals use restrictions but unable to create hashCode from + // restrictions because it is not + // constant through time using arbitrary constant hash-code + return And.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-08-03 09:29:14 UTC (rev 216) @@ -123,17 +123,10 @@ } public int hashCode() { - int result = Between.class.getName().hashCode(); - if (element != null) { - result = 29 * result + element.hashCode(); - } - if (min != null) { - result = 29 * result + min.hashCode(); - } - if (max != null) { - result = 29 * result + max.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Between.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-08-03 09:29:14 UTC (rev 216) @@ -97,14 +97,10 @@ } public int hashCode() { - int result = BinaryOperator.class.getName().hashCode(); - if (element != null) { - result = 29 * result + element.hashCode(); - } - if (value != null) { - result = 29 * result + value.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return BinaryOperator.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-08-03 09:29:14 UTC (rev 216) @@ -106,14 +106,10 @@ } public int hashCode() { - int result = Contains.class.getName().hashCode(); - if (element != null) { - result = 29 * result + element.hashCode(); - } - if (value != null) { - result = 29 * result + value.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Contains.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-08-03 09:29:14 UTC (rev 216) @@ -41,9 +41,10 @@ } public int hashCode() { - int result = EndsWith.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return EndsWith.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-08-03 09:29:14 UTC (rev 216) @@ -41,9 +41,10 @@ } public int hashCode() { - int result = Equals.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Equals.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-08-03 09:29:14 UTC (rev 216) @@ -41,9 +41,10 @@ } public int hashCode() { - int result = Greater.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Greater.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-08-03 09:29:14 UTC (rev 216) @@ -41,9 +41,10 @@ } public int hashCode() { - int result = GreaterOrEqual.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return GreaterOrEqual.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-08-03 09:29:14 UTC (rev 216) @@ -108,14 +108,10 @@ } public int hashCode() { - int result = In.class.getName().hashCode(); - if (element != null) { - result = 29 * result + element.hashCode(); - } - if (value != null) { - result = 29 * result + value.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return In.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-08-03 09:29:14 UTC (rev 216) @@ -40,9 +40,10 @@ } public int hashCode() { - int result = Less.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Less.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-08-03 09:29:14 UTC (rev 216) @@ -40,9 +40,10 @@ } public int hashCode() { - int result = LessOrEqual.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return LessOrEqual.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-08-03 09:29:14 UTC (rev 216) @@ -75,11 +75,10 @@ } public int hashCode() { - int result = Not.class.getName().hashCode(); - if (restriction != null) { - result = 29 * result + restriction.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Not.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-08-03 09:29:14 UTC (rev 216) @@ -40,9 +40,10 @@ } public int hashCode() { - int result = NotEquals.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return NotEquals.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-08-03 09:29:14 UTC (rev 216) @@ -80,11 +80,10 @@ } public int hashCode() { - int result = Or.class.getName().hashCode(); - if (restrictions != null) { - result = 29 * result + restrictions.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Or.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-08-03 09:29:14 UTC (rev 216) @@ -72,11 +72,10 @@ } public int hashCode() { - int result = Restriction.class.getName().hashCode(); - if (name != null) { - result = 29 * result + name.hashCode(); - } - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return Restriction.class.hashCode(); } } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-08-02 09:21:21 UTC (rev 215) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-08-03 09:29:14 UTC (rev 216) @@ -40,9 +40,10 @@ } public int hashCode() { - int result = StartsWith.class.getName().hashCode(); - result = 29 * result + super.hashCode(); - return result; + // equals use objects that are not constant through time + // then, unable to create hashCode from those objects + // returning a constant hash-code + return StartsWith.class.hashCode(); } } \ No newline at end of file