Replace to Generics Diamond.

Replace ArrayList to List.
remove bug by contentType from marshallers