refactor & sonar fixes #4593

Job	Run time
build-matrix	9s
ng-default	15m 37s
ng-default-additional	10m 43s
ng-mysql-es-noi18n-mapsid	13m 19s
ng-mongodb-kafka-cucumber	10m 36s
ng-h2mem-ws-nol2	10m 59s
ng-gradle-fr	11m 27s
ng-gradle-mariadb-oauth2-infinispan	13m 24s
ng-gradle-h2disk-ws-nocache	12m 30s
ng-webflux-mongodb	8m 45s
ng-webflux-gradle-mongodb-oauth2	8m 32s
ng-webflux-psql-default	10m 30s
ng-webflux-psql-additional	5m 47s
ng-webflux-gradle-session-h2mem-es	7m 49s
ms-ng-consul-oauth2-mongodb-caffeine	14m 29s
mf-ng-eureka-jwt-psql-ehcache	16m 9s
ms-mf-ng-consul-oauth2-neo4j	16m 19s
check-angular	1s
	3h 7m 5s

Provide feedback