use spring explicit mapping annotaitons, minor refactoring and cleanup #145

Closed ghost closed 4 years ago