CDB-4232 Remove uneeded require
CDB-4232 Split the QueryGenerator adding a new class InputTypeResolver (SRP, testability)