use wrapper classes instead of primitves in jpa model

Change-Id: I4407f24208b856d391acba34852e999e8effedac