Missing @Overrides
Explicit boxing
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/functor/trunk@1187616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java b/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
index 4184369..c893a62 100644
--- a/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
+++ b/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
@@ -65,12 +65,13 @@
* non-<code>Boolean</code>
*/
public boolean test(final L left, final R right) {
- return function.evaluate(left, right);
+ return function.evaluate(left, right).booleanValue();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(final Object that) {
return that == this
|| (that instanceof BinaryFunctionBinaryPredicate<?, ?>
@@ -89,6 +90,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "BinaryFunctionBinaryPredicate".hashCode();
if (null != function) {
@@ -100,6 +102,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "BinaryFunctionBinaryPredicate<" + function + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java b/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
index bb15142..d78048d 100644
--- a/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
+++ b/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
@@ -63,12 +63,13 @@
* {@inheritDoc}
*/
public boolean test() {
- return function.evaluate();
+ return function.evaluate().booleanValue();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this || (that instanceof FunctionPredicate && equals((FunctionPredicate) that));
}
@@ -85,6 +86,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "FunctionPredicate".hashCode();
if (null != function) {
@@ -96,6 +98,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "FunctionPredicate<" + function + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java b/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
index afe2f52..905212a 100644
--- a/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
+++ b/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
@@ -65,12 +65,13 @@
* @return a non-<code>null</code> <code>Boolean</code> instance
*/
public Boolean evaluate() {
- return predicate.test();
+ return Boolean.valueOf(predicate.test());
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this || (that instanceof PredicateFunction && equals((PredicateFunction) that));
}
@@ -87,6 +88,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "PredicateFunction".hashCode();
if (null != predicate) {
@@ -98,6 +100,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "PredicateFunction<" + predicate + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java b/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java
index e50c0a6..10bf225 100644
--- a/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java
+++ b/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java
@@ -65,12 +65,13 @@
* method of my underlying function.
*/
public boolean test(A obj) {
- return function.evaluate(obj);
+ return function.evaluate(obj).booleanValue();
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this
|| (that instanceof UnaryFunctionUnaryPredicate<?> && equals((UnaryFunctionUnaryPredicate<?>) that));
@@ -88,6 +89,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "UnaryFunctionUnaryPredicate".hashCode();
if (null != function) {
@@ -99,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "UnaryFunctionUnaryPredicate<" + function + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java b/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java
index d8a1aef..70c1575 100644
--- a/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java
+++ b/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java
@@ -71,6 +71,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this
|| (that instanceof UnaryFunctionUnaryProcedure<?> && equals((UnaryFunctionUnaryProcedure<?>) that));
@@ -88,6 +89,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "UnaryFunctionUnaryProcedure".hashCode();
if (null != function) {
@@ -99,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "UnaryFunctionUnaryProcedure<" + function + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java b/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java
index 6c0dab1..9165c75 100644
--- a/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java
+++ b/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java
@@ -66,12 +66,13 @@
* @return a non-<code>null</code> <code>Boolean</code> instance
*/
public Boolean evaluate(A obj) {
- return predicate.test(obj);
+ return Boolean.valueOf(predicate.test(obj));
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this
|| (that instanceof UnaryPredicateUnaryFunction<?> && equals((UnaryPredicateUnaryFunction<?>) that));
@@ -89,6 +90,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "UnaryPredicateUnaryFunction".hashCode();
if (null != predicate) {
@@ -100,6 +102,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "UnaryPredicateUnaryFunction<" + predicate + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java b/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
index e494bad..57714c3 100644
--- a/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
+++ b/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
@@ -70,6 +70,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object that) {
return that == this || (that instanceof UnaryProcedureUnaryFunction<?, ?>
&& equals((UnaryProcedureUnaryFunction<?, ?>) that));
@@ -87,6 +88,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "UnaryProcedureUnaryFunction".hashCode();
if (null != procedure) {
@@ -98,6 +100,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "UnaryProcedureUnaryFunction<" + procedure + ">";
}
diff --git a/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java b/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
index 9f72f48..fad9a84 100644
--- a/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
+++ b/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
@@ -95,12 +95,13 @@
public Number evaluate(Generator<? extends T> left, UnaryPredicate<? super T> right) {
IndexProcedure<T> findProcedure = new IndexProcedure<T>(left, right);
left.run(findProcedure);
- return findProcedure.index;
+ return Long.valueOf(findProcedure.index);
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object obj) {
return obj == this || obj != null && obj.getClass().equals(getClass());
}
@@ -108,6 +109,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
return System.identityHashCode(INSTANCE);
}
diff --git a/src/main/java/org/apache/commons/functor/generator/util/LongRange.java b/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
index 8ddfaac..17eb3ed 100644
--- a/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
+++ b/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
@@ -97,11 +97,11 @@
public void run(UnaryProcedure<? super Long> proc) {
if (signOf(step) == -1L) {
for (long i = from; i > to; i += step) {
- proc.run(i);
+ proc.run(Long.valueOf(i));
}
} else {
for (long i = from; i < to; i += step) {
- proc.run(i);
+ proc.run(Long.valueOf(i));
}
}
}
@@ -109,6 +109,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return "LongRange<" + from + "," + to + "," + step + ">";
}
@@ -116,6 +117,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -130,6 +132,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
int hash = "LongRange".hashCode();
hash <<= 2;
