Annotation update

@QueryParamMap and @QueryParamObject is combined in @QueryParamsWith annotation.
Documentation needs to be updated after merge.