use java 7 diamond syntax
Remove obsolete TODOs.
Use diamond operator
Correct javadoc
Pass th id of the reservation instead of the reservation itself