SWRVE-7285 replace DoneHandlerInputStream

https://swrvedev.jira.com/browse/SWRVE-7285
@Sergio-Mira can you take a quick look please?