| Chunk |
|---|
| Conflicting content |
|---|
import net.cipol.model.PolicySummary; import net.cipol.model.RuleDefinition; import net.cipol.model.RuleSet; <<<<<<< HEAD import net.cipol.security.CipolRole; ======= import net.cipol.model.support.PolicyField; >>>>>>> aaf6ffcab3a96f3c21b734e98a036f819c703466 import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; |
| Solution content |
|---|
import net.cipol.model.PolicySummary; import net.cipol.model.RuleDefinition; import net.cipol.model.RuleSet; import net.cipol.security.CipolRole; import net.cipol.model.support.PolicyField; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; |
| File |
|---|
| PolicyCore.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
@Transactional
<<<<<<< HEAD
@Secured(CipolRole.ADMIN)
=======
@CacheEvict("policy")
>>>>>>> aaf6ffcab3a96f3c21b734e98a036f819c703466
public void deletePolicy(String uid) {
log.debug("Deleting policy {}", uid);
getNamedParameterJdbcTemplate().update(SQL.POLICY_DELETE, Collections.singletonMap("uid", uid)); |
| Solution content |
|---|
@Override
@Transactional
@Secured(CipolRole.ADMIN)
@CacheEvict("policy")
public void deletePolicy(String uid) {
log.debug("Deleting policy {}", uid);
getNamedParameterJdbcTemplate().update(SQL.POLICY_DELETE, Collections.singletonMap("uid", uid)); |
| File |
|---|
| PolicyCore.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Annotation |