Projects >> openiam-idm-ce >>3f4b09d16cd50a3e1a0dcd2eb24e1b022b2c4fa3

Chunk
Conflicting content 
import org.openiam.idm.srvc.report.domain.ReportSubscriptionEntity;
import org.openiam.idm.srvc.report.service.ReportDataService;
import org.openiam.idm.srvc.role.dto.UserRole;
<<<<<<< HEAD
import org.openiam.idm.srvc.role.ws.RoleDataWebService;
import org.openiam.idm.srvc.role.ws.UserRoleListResponse;
import org.openiam.idm.srvc.user.dto.User;
import org.openiam.idm.srvc.user.dto.UserSearch;
import org.openiam.idm.srvc.user.ws.UserDataWebService;
import org.openiam.idm.srvc.user.ws.UserListResponse;
import org.openiam.idm.srvc.user.ws.UserResponse;
=======
import org.openiam.idm.srvc.role.service.RoleDataService;
import org.openiam.idm.srvc.user.dto.User;
import org.openiam.idm.srvc.user.dto.UserSearch;
import org.openiam.idm.srvc.user.service.UserDataService;
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
import org.openiam.script.ScriptFactory;
import org.openiam.script.ScriptIntegration;
import org.springframework.beans.BeansException;
Solution content 
import org.openiam.idm.srvc.report.domain.ReportSubscriptionEntity;
import org.openiam.idm.srvc.report.service.ReportDataService;
import org.openiam.idm.srvc.role.dto.UserRole;
import org.openiam.idm.srvc.role.ws.RoleDataWebService;
import org.openiam.idm.srvc.role.ws.UserRoleListResponse;
import org.openiam.idm.srvc.user.dto.User;
import org.openiam.idm.srvc.user.dto.UserSearch;
import org.openiam.idm.srvc.user.ws.UserDataWebService;
import org.openiam.idm.srvc.user.ws.UserListResponse;
import org.openiam.idm.srvc.user.ws.UserResponse;
import org.openiam.script.ScriptFactory;
import org.openiam.script.ScriptIntegration;
import org.springframework.beans.BeansException;
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	protected PolicyDataService policyDataService;
	@Autowired
	protected ReportDataService reportDataService;
<<<<<<< HEAD
	protected UserDataWebService userManager;
	protected GroupDataService groupManager;
	protected RoleDataWebService roleDataService;
=======
	protected UserDataService userManager;
	protected GroupDataService groupManager;
	protected RoleDataService roleDataService;
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
	protected MailService mailService;
	protected BatchDataService batchService;
	protected String scriptEngine;
Solution content 
	protected PolicyDataService policyDataService;
	@Autowired
	protected ReportDataService reportDataService;
	protected UserDataWebService userManager;
	protected GroupDataService groupManager;
	protected RoleDataWebService roleDataService;
	protected MailService mailService;
	protected BatchDataService batchService;
	protected String scriptEngine;
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
	protected BatchDataService batchService;
	protected String scriptEngine;
	protected AuditHelper auditHelper;
<<<<<<< HEAD
	
=======

>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
			.getBundle("datasource");
	static protected ResourceBundle res = ResourceBundle
	boolean isPrimary = Boolean.parseBoolean(res.getString("IS_PRIMARY"));
Solution content 
	protected BatchDataService batchService;
	protected String scriptEngine;
	protected AuditHelper auditHelper;
	
	static protected ResourceBundle res = ResourceBundle
			.getBundle("datasource");
	boolean isPrimary = Boolean.parseBoolean(res.getString("IS_PRIMARY"));
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
	}

	/**
		//commented to make sure merge goes through without any issues
		//executeBIRTTasks();

<<<<<<< HEAD
=======
		executeBIRTTasks();

>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
Solution content 
		//commented to make sure merge goes through without any issues
		//executeBIRTTasks();

	}

	/**
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
				params.put(parameter.getName(), parameter.getValue());
			}
			try {
<<<<<<< HEAD
				UserResponse userResponse = userManager.getUserWithDependent(report.getUserId(), false);
				User user = userResponse.getUser();
=======
				User user = userManager.getUser(report.getUserId());
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
					UserSearch search = new UserSearch();
					List emailAddresses = new ArrayList();
					List userIds = new ArrayList();
Solution content 
				params.put(parameter.getName(), parameter.getValue());
			}
			try {
				UserResponse userResponse = userManager.getUserWithDependent(report.getUserId(), false);
				User user = userResponse.getUser();
					UserSearch search = new UserSearch();
					List emailAddresses = new ArrayList();
					List userIds = new ArrayList();
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
					} else{ 
						if ("ROLE".equalsIgnoreCase(report
								.getDeliveryAudience())) {
<<<<<<< HEAD
							UserRoleListResponse userRolesResponse = roleDataService.getUserRolesForUser(report.getUserId());
							List userRoles = userRolesResponse.getUserRoleList();
							List roleList = new ArrayList();
							String domainId="";
							//Assuming that domain of all users is same, or it will pick last one
							//TODO --clarify the above assumption
							for (UserRole role: userRoles){
								roleList.add(role.getRoleId());
								domainId = role.getServiceId();
							}
							search.setRoleIdList(roleList);
							search.setDomainId(domainId);
=======
							List userRoles = roleDataService.getUserRolesForUser(report.getUserId());
							List roleList = new ArrayList();
							for (UserRole role: userRoles){
								roleList.add(role.getRoleId());
							}
							search.setRoleIdList(roleList);
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
						} else if ("DEPT".equalsIgnoreCase(report
								.getDeliveryAudience())) {
							search.setDeptCd(user.getDeptCd());
Solution content 
						} else if ("DEPT".equalsIgnoreCase(report
								.getDeliveryAudience())) {
							search.setDeptCd(user.getDeptCd());
							search.setDomainId(domainId);
					} else{ 
						if ("ROLE".equalsIgnoreCase(report
								.getDeliveryAudience())) {
							UserRoleListResponse userRolesResponse = roleDataService.getUserRolesForUser(report.getUserId());
							List userRoles = userRolesResponse.getUserRoleList();
							List roleList = new ArrayList();
							String domainId="";
							//Assuming that domain of all users is same, or it will pick last one
							//TODO --clarify the above assumption
							for (UserRole role: userRoles){
								roleList.add(role.getRoleId());
								domainId = role.getServiceId();
							}
							search.setRoleIdList(roleList);
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
Method invocation
Variable
Chunk
Conflicting content 
							}
							search.setGroupIdList(groupList);
						}
<<<<<<< HEAD
						UserListResponse userListResponse = userManager.search(search);
						List userList = userListResponse.getUserList();
=======
						List userList = userManager.search(search);
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
						for (User user1: userList){
							emailAddresses.add(user1.getEmail());
							userIds.add(user.getUserId());
Solution content 
							}
							search.setGroupIdList(groupList);
						}
						UserListResponse userListResponse = userManager.search(search);
						List userList = userListResponse.getUserList();
						for (User user1: userList){
							emailAddresses.add(user1.getEmail());
							userIds.add(user.getUserId());
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
							userIds.add(user.getUserId());
						}
					}
<<<<<<< HEAD
					//emailAddresses.toArray();
					//userIds.toArray();
=======
					emailAddresses.toArray();
					userIds.toArray();
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
					//send email
				
				ReportGenerator.generateReport(report.getReportName(),
Solution content 
							userIds.add(user.getUserId());
						}
					}
					//emailAddresses.toArray();
					//userIds.toArray();
					//send email
				
				ReportGenerator.generateReport(report.getReportName(),
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
	public ReportDataService getReportDataService() {
		return reportDataService;
	}
<<<<<<< HEAD

	public void setReportDataService(ReportDataService reportDataService) {
		this.reportDataService = reportDataService;
	}

	public UserDataWebService getUserManager() {
		return userManager;
	}

	public void setUserManager(UserDataWebService userManager) {
		this.userManager = userManager;
=======

	public void setReportDataService(ReportDataService reportDataService) {
		this.reportDataService = reportDataService;
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
	}

	public UserDataService getUserManager() {
Solution content 
	public ReportDataService getReportDataService() {
		return reportDataService;
	}

	public void setReportDataService(ReportDataService reportDataService) {
		this.reportDataService = reportDataService;
	}

	public UserDataWebService getUserManager() {
		return userManager;
	}

	public void setUserManager(UserDataWebService userManager) {
		this.userManager = userManager;
	}
File
NightlyTask.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method signature
Chunk
Conflicting content 
		return userManager;
	}

		return roleDataService;
	}
<<<<<<< HEAD
	public RoleDataWebService getRoleDataService() {

	public void setRoleDataService(RoleDataWebService roleDataService) {
		this.roleDataService = roleDataService;
=======
	public void setUserManager(UserDataService userManager) {
		this.userManager = userManager;
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
	}

	public MailService getMailService() {
Solution content 
	public RoleDataWebService getRoleDataService() {
		return roleDataService;
	}

	public void setRoleDataService(RoleDataWebService roleDataService) {
		this.roleDataService = roleDataService;
	}

	public MailService getMailService() {
		return mailService;
	}

	public void setMailService(MailService mailService) {
		this.mailService = mailService;
	}

	public GroupDataService getGroupManager() {
		return groupManager;
	}

	public void setGroupManager(GroupDataService groupManager) {
		this.groupManager = groupManager;
	}

}
File
NightlyTask.java
Developer's decision
Manual
Kind of conflict
Attribute
Method declaration
Method signature
Chunk
Conflicting content 
<<<<<<< HEAD
=======

	public RoleDataService getRoleDataService() {
		return roleDataService;
	}
		return mailService;
	}

	public void setRoleDataService(RoleDataService roleDataService) {
		this.roleDataService = roleDataService;
	}

	public MailService getMailService() {
		return mailService;
	}

>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
	public void setMailService(MailService mailService) {
		this.mailService = mailService;
	}
Solution content 
	}

	public MailService getMailService() {
		return mailService;
	}

	public void setMailService(MailService mailService) {
		this.mailService = mailService;
	}
File
NightlyTask.java
Developer's decision
Combination
Kind of conflict
Method declaration
Chunk
Conflicting content 
	protected ModelAndView onSubmit(HttpServletRequest request,
			HttpServletResponse response, Object command, BindException errors)
			throws Exception {
<<<<<<< HEAD
		HttpSession session = request.getSession(true);
	 	session.removeAttribute("reportCommand");
=======
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
		SubscribeReportsCommand reportCommand = ((SubscribeReportsCommand) command);
		if (request.getParameterMap().containsKey("save")) {
			if (!StringUtils.isEmpty(reportCommand.getReport().getReportName())) {
Solution content 
	protected ModelAndView onSubmit(HttpServletRequest request,
			HttpServletResponse response, Object command, BindException errors)
			throws Exception {
		HttpSession session = request.getSession(true);
	 	session.removeAttribute("reportCommand");
		SubscribeReportsCommand reportCommand = ((SubscribeReportsCommand) command);
		if (request.getParameterMap().containsKey("save")) {
			if (!StringUtils.isEmpty(reportCommand.getReport().getReportName())) {
File
SubscribeReportsController.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
								.getParamTypeId()[i]));
					}
				}
<<<<<<< HEAD
		        //HttpSession session = request.getSession();
		        String userId = (String) session.getAttribute("userId");
				ReportSubscriptionDto dto = reportCommand.getReport();
				dto.setUserId(userId);
				if (dto.getReportId() == null || "".equals(dto.getReportId()) || dto.getReportId().trim().length() <=0)
					dto.setReportId(null);
=======
		        HttpSession session = request.getSession();
		        String userId = (String) session.getAttribute("userId");
				ReportSubscriptionDto dto = reportCommand.getReport();
				dto.setUserId(userId);
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
				reportService.createOrUpdateSubscribedReportInfo(
						reportCommand.getReport(), params);
			}
Solution content 
								.getParamTypeId()[i]));
					}
				}
		        //HttpSession session = request.getSession();
		        String userId = (String) session.getAttribute("userId");
				ReportSubscriptionDto dto = reportCommand.getReport();
				dto.setUserId(userId);
				if (dto.getReportId() == null || "".equals(dto.getReportId()) || dto.getReportId().trim().length() <=0)
					dto.setReportId(null);
				reportService.createOrUpdateSubscribedReportInfo(
						reportCommand.getReport(), params);
			}
File
SubscribeReportsController.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
						reportCommand.getReport(), params);
			}
		}else{
<<<<<<< HEAD
			if (!StringUtils.isEmpty(reportCommand.getReport().getReportId())) {
				 ModelAndView modelAndView = new ModelAndView(new RedirectView("subscribeReportOld.selfserve", true));
		            List paramDtos = reportService.getReportParametersByReportName(reportCommand.getReport().getReportName()).getParameters();
		            modelAndView.addObject("reportParameters", paramDtos);
		            modelAndView.addObject("reportCommand", reportCommand);
				    //HttpSession session = request.getSession(true);
				 	session.setAttribute("reportCommand", reportCommand);
=======
			if (!StringUtils.isEmpty(reportCommand.getReport().getReportName())) {
				 ModelAndView modelAndView = new ModelAndView(new RedirectView("subscribeReportOld.selfserve", true), "reportCommand", reportCommand);
		            List paramDtos = reportService.getReportParametersByReportName(reportCommand.getReport().getReportName()).getParameters();
		            modelAndView.addObject("reportParameters", paramDtos);
>>>>>>> c76fb789889c491e05ea26c8bb51259e144726de
		            return modelAndView;
			}
		}
Solution content 
						reportCommand.getReport(), params);
			}
		}else{
			if (!StringUtils.isEmpty(reportCommand.getReport().getReportId())) {
				 ModelAndView modelAndView = new ModelAndView(new RedirectView("subscribeReportOld.selfserve", true));
		            List paramDtos = reportService.getReportParametersByReportName(reportCommand.getReport().getReportName()).getParameters();
		            modelAndView.addObject("reportParameters", paramDtos);
		            modelAndView.addObject("reportCommand", reportCommand);
				    //HttpSession session = request.getSession(true);
				 	session.setAttribute("reportCommand", reportCommand);
		            return modelAndView;
			}
		}
File
SubscribeReportsController.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable