Replace ReentrantLock with Lock

Remove now useless mockito