javadoc
add annotation
fix test
use matchers in test
remove unused method
javadoc
javadoc target