extract two factor logic into separate classes processing each type o… #398

Job	Run time
Coding Standard & Static Analysis	10s
testsuite (7.4, sqlite)	16s
testsuite (7.4, mysql)	21s
testsuite (7.4, pgsql)	18s
testsuite (8.0, sqlite)	10s
testsuite (8.0, mysql)	29s
testsuite (8.0, pgsql)	17s
testsuite (8.1, sqlite)	10s
testsuite (8.1, mysql)	22s
testsuite (8.1, pgsql)	16s
testsuite (8.2, sqlite)	16s
testsuite (8.2, mysql)	23s
testsuite (8.2, pgsql)	16s
testsuite (8.3, sqlite)	14s
testsuite (8.3, mysql)	24s
testsuite (8.3, pgsql)	27s
	4m 49s

Provide feedback