JAX-RS refactor