JAL-2286 javadoc, refactor, unit tests for threshold and conservation