Projects >> candlepin >>bee47aa3f9c4a0f9ec0764a2bf34cbeeae2252a4

Chunk
Conflicting content 
import org.candlepin.policy.EntitlementRefusedException;
import org.candlepin.policy.PoolRules;
import org.candlepin.policy.ValidationResult;
<<<<<<< HEAD
import org.candlepin.policy.criteria.RulesCriteria;
=======
import org.candlepin.policy.js.ProductCache;
>>>>>>> 1a2b942aaf3eed0b0ecced52a63977ce37d3b7ec
import org.candlepin.policy.js.compliance.ComplianceRules;
import org.candlepin.policy.js.compliance.ComplianceStatus;
import org.candlepin.policy.js.entitlement.PreEntHelper;
Solution content 
import org.candlepin.policy.EntitlementRefusedException;
import org.candlepin.policy.PoolRules;
import org.candlepin.policy.ValidationResult;
import org.candlepin.policy.criteria.RulesCriteria;
import org.candlepin.policy.js.ProductCache;
import org.candlepin.policy.js.compliance.ComplianceRules;
import org.candlepin.policy.js.compliance.ComplianceStatus;
import org.candlepin.policy.js.entitlement.PreEntHelper;
File
CandlepinPoolManager.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    protected Injector injector;

    @Inject
<<<<<<< HEAD
    protected PoolCurator(Enforcer enforcer, RulesCriteria poolCriteria) {
=======
    protected ProductCache productCache;

    @Inject
    protected PoolCurator(Enforcer enforcer) {
>>>>>>> 1a2b942aaf3eed0b0ecced52a63977ce37d3b7ec
        super(Pool.class);
        this.enforcer = enforcer;
        this.poolCriteria = poolCriteria;
Solution content 
    protected Injector injector;

    @Inject
    protected ProductCache productCache;
    @Inject    
    protected PoolCurator(Enforcer enforcer, RulesCriteria poolCriteria) {
        super(Pool.class);
        this.enforcer = enforcer;
        this.poolCriteria = poolCriteria;
File
PoolCurator.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Method signature
Chunk
Conflicting content 
import org.candlepin.policy.Enforcer;
import org.candlepin.policy.PoolRules;
import org.candlepin.policy.ValidationResult;
<<<<<<< HEAD
import org.candlepin.policy.criteria.RulesCriteria;
=======
import org.candlepin.policy.js.ProductCache;
>>>>>>> 1a2b942aaf3eed0b0ecced52a63977ce37d3b7ec
import org.candlepin.policy.js.compliance.ComplianceRules;
import org.candlepin.policy.js.compliance.ComplianceStatus;
import org.candlepin.policy.js.entitlement.PreEntHelper;
Solution content 
import org.candlepin.policy.Enforcer;
import org.candlepin.policy.PoolRules;
import org.candlepin.policy.ValidationResult;
import org.candlepin.policy.criteria.RulesCriteria;
import org.candlepin.policy.js.ProductCache;
import org.candlepin.policy.js.compliance.ComplianceRules;
import org.candlepin.policy.js.compliance.ComplianceStatus;
import org.candlepin.policy.js.entitlement.PreEntHelper;
File
PoolManagerTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
        this.productCache = new ProductCache(mockProductAdapter);
        this.principal = TestUtil.createOwnerPrincipal();
        this.manager = spy(new CandlepinPoolManager(mockPoolCurator, mockSubAdapter,
<<<<<<< HEAD
            mockProductAdapter, entCertAdapterMock, mockEventSink,
            eventFactory, mockConfig, enforcerMock, poolRulesMock, poolCriteriaMock,
            entitlementCurator, consumerCuratorMock, certCuratorMock, complianceRules));
=======
            productCache, entCertAdapterMock, mockEventSink,
            eventFactory, mockConfig, enforcerMock, poolRulesMock, entitlementCurator,
            consumerCuratorMock, certCuratorMock, complianceRules));
>>>>>>> 1a2b942aaf3eed0b0ecced52a63977ce37d3b7ec

        when(entCertAdapterMock.generateEntitlementCert(any(Entitlement.class),
            any(Subscription.class), any(Product.class))).thenReturn(
Solution content 
        this.productCache = new ProductCache(mockProductAdapter);
        this.principal = TestUtil.createOwnerPrincipal();
        this.manager = spy(new CandlepinPoolManager(mockPoolCurator, mockSubAdapter,
	    productCache, entCertAdapterMock, mockEventSink,
            eventFactory, mockConfig, enforcerMock, poolRulesMock, poolCriteriaMock,
            entitlementCurator, consumerCuratorMock, certCuratorMock, complianceRules));

        when(entCertAdapterMock.generateEntitlementCert(any(Entitlement.class),
            any(Subscription.class), any(Product.class))).thenReturn(
File
PoolManagerTest.java
Developer's decision
Combination
Kind of conflict
Attribute