Projects >> sonarqube >>78e19d71b026ab2ac29539b032e837e8ccaebd4e

Chunk
Conflicting content
    }));
  }

<<<<<<< HEAD
  private Issue toIssue(IssueDto issueDto) {
    // FIXME N+1 SQL requests
    Rule rule = ruleFinder.findById(issueDto.getRuleId());
    DefaultIssue issue = new DefaultIssue();
    issue.setStatus(issueDto.getStatus());
    issue.setResolution(issueDto.getResolution());
    issue.setMessage(issueDto.getMessage());
    issue.setCost(issueDto.getCost());
    issue.setLine(issueDto.getLine());
    issue.setUserLogin(issueDto.getUserLogin());
    issue.setAssigneeLogin(issueDto.getAssigneeLogin());
    // FIXME N+1 SQL requests
    issue.setComponentKey(resourceDao.getResource(issueDto.getResourceId()).getKey());
    issue.setRuleKey(rule.getKey());
    issue.setRuleRepositoryKey(rule.getRepositoryKey());
    return issue;
=======
  public Issue findByKey(String key){
    IssueDto issueDto = issueDao.findByUuid(key);
    return issueDto != null ? toIssue(issueDto) : null;
  }

  private Issue toIssue(IssueDto issueDto){
    Issue.Builder issueBuilder = new Issue.Builder();
    issueBuilder.status(issueDto.getStatus());
    issueBuilder.resolution(issueDto.getResolution());
    issueBuilder.message(issueDto.getMessage());
    issueBuilder.title(issueDto.getTitle());
    issueBuilder.cost(issueDto.getCost());
    issueBuilder.line(issueDto.getLine());
    issueBuilder.severity(issueDto.getSeverity());
    issueBuilder.userLogin(issueDto.getUserLogin());
    issueBuilder.assigneeLogin(issueDto.getAssigneeLogin());

    ResourceDto resource = resourceDao.getResource(issueDto.getResourceId());
    issueBuilder.componentKey(resource.getKey());

    Rule rule = ruleFinder.findById(issueDto.getRuleId());
    issueBuilder.ruleKey(rule.getKey());
    issueBuilder.ruleRepositoryKey(rule.getRepositoryKey());

    // TODO add key and dates

    return issueBuilder.build();
>>>>>>> 073fce204ab53a555fe3c5733c43f5f88316646d
  }

}
Solution content
    }));
  }

  public Issue findByKey(String key){
    IssueDto issueDto = issueDao.findByUuid(key);
    return issueDto != null ? toIssue(issueDto) : null;
  }

  private Issue toIssue(IssueDto issueDto){
    DefaultIssue issue = new DefaultIssue();
    issue.setStatus(issueDto.getStatus());
    issue.setResolution(issueDto.getResolution());
    issue.setMessage(issueDto.getMessage());
    issue.setTitle(issueDto.getTitle());
    issue.setCost(issueDto.getCost());
    issue.setLine(issueDto.getLine());
    issue.setSeverity(issueDto.getSeverity());
    issue.setUserLogin(issueDto.getUserLogin());
    issue.setAssigneeLogin(issueDto.getAssigneeLogin());

    ResourceDto resource = resourceDao.getResource(issueDto.getResourceId());
    issue.setComponentKey(resource.getKey());

    Rule rule = ruleFinder.findById(issueDto.getRuleId());
    issue.setRuleKey(rule.getKey());
    issue.setRuleRepositoryKey(rule.getRepositoryKey());

    // TODO add key and dates

    return issue;
  }

}
File
DefaultIssueFinder.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable