Refactor : reduce code complexity

2 jobs for master in 3 minutes and 25 seconds (queued for 1 second)
Status Name Job ID Coverage
  Sonar Analysis
passed sonarqube #14474

00:01:10

 
  Build
passed build-master #14475

00:02:14