SONAR-2501 refactor BeanGraph layer