Fixed: Sonar: Unnecessary Local Before Return.
Fixed: Sonar: Hide Utility Class Constructor.
MappingException was replaced with MapperException.
MapperException is Exception but not RuntimeException.