chore(): prepare for alternative BpmProvider implementation

Author: os-cib

cibseven-webclient-core/src/main/java/org/cibseven/webapp/auth/SevenUserProvider.java

@@ -52,15 +52,11 @@ public class SevenUserProvider extends BaseUserProvider<StandardLogin> {
 
 	@Value("${cibseven.webclient.engineRest.url:./}") String cibsevenUrl;
 
-	@Autowired BpmProvider provider;
-	SevenProvider sevenProvider;
+	@Autowired BpmProvider bpmProvider;
 
 	@PostConstruct
 	public void init() {
 		settings = new JwtTokenSettings(secret, validMinutes, prolongMinutes);
-		if (provider instanceof SevenProvider)
-			sevenProvider = (SevenProvider) provider;
-		else throw new SystemException("SevenUserProvider expects a SevenProvider");
 		checkKey();
 	}
 
@@ -69,12 +65,12 @@ public CIBUser login(StandardLogin login, HttpServletRequest rq) {
 		try {
 			CIBUser user =  new CIBUser(login.getUsername());
 			setEngineFromRequest(user, rq);
-			SevenVerifyUser sevenVerifyUser = sevenProvider.verifyUser(user.getId(), login.getPassword(), user);
+			SevenVerifyUser sevenVerifyUser = bpmProvider.verifyUser(user.getId(), login.getPassword(), user);
 
 			if (sevenVerifyUser.isAuthenticated()) {
 			  // Token is needed for the next request (/user/xxx/profile)
 			  user.setAuthToken(createToken(getSettings(), true, false, user));
-				SevenUser cUser = sevenProvider.getUserProfile(user.getId(), user);
+				SevenUser cUser = bpmProvider.getUserProfile(user.getId(), user);
 				user.setUserID(cUser.getId());
 				user.setDisplayName(cUser.getFirstName() + " " + cUser.getLastName());
 				// Token is created for the second time to include the display name

cibseven-webclient-core/src/main/java/org/cibseven/webapp/providers/BpmProvider.java

@@ -523,8 +523,11 @@ public void deleteProcessDefinition(String id, Optional<Boolean> cascade, CIBUse
 	 * @param processStatistics Collection of ProcessStatistics to group
 	 * @return List of grouped ProcessStatistics with aggregated values
 	 */
-	@Override
 	public List<ProcessStatistics> groupProcessStatisticsByKeyAndTenant(Collection<ProcessStatistics> processStatistics) {
+		return groupProcessStatisticsByKeyAndTenantImpl(processStatistics);
+	}
+	
+	public static List<ProcessStatistics> groupProcessStatisticsByKeyAndTenantImpl(Collection<ProcessStatistics> processStatistics) {
 		return processStatistics.stream()
 			.collect(Collectors.groupingBy(
 				stat -> new KeyTenant(stat.getDefinition().getKey(), stat.getDefinition().getTenantId())
@@ -562,6 +565,7 @@ public List<ProcessStatistics> groupProcessStatisticsByKeyAndTenant(Collection<P
 			})
 			.collect(Collectors.toList());
 	}
+
 	@Override
 	public Object fetchHistoricActivityStatistics(String id, Map<String, Object> params, CIBUser user) {
 	    String url = URLUtils.buildUrlWithParams(getEngineRestUrl(user) + "/history/process-definition/" + id + "/statistics", params);