Use lombok for data objects

Removing lines to see if this will bump coverage. Some sonar
for Junit tests and missing coverage.

My next task will be to re-use some of this duplicate code
for these object types and the controllers.

Trailing spaces for patch #3.

Issue-ID: POLICY-2133
Change-Id: Iaee123c6be4b63bd831172340709fe7597feaa78
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>