Resolve Sonar Boolean expression complexity issue with EntityVersion