add where and junit test