use java8 streams
fixed Bug on not trimmed value
codebase used to migrate to java8 the production system