fix build
Merge pull request #519 from sajmoon/spring-fix

Spring fix. Add missing imports.
Add test for @Query Paramter
Add implementation of @Query