Projects >> candlepin >>b647047ddccfd8a6744f186879385d88c87ec33f

Chunk
Conflicting content
        ComplianceRules complianceRules, DeletedConsumerCurator deletedConsumerCurator,
        EnvironmentCurator environmentCurator,
        DistributorVersionCurator distributorVersionCurator,
<<<<<<< HEAD
        CdnCurator cdnCurator, QuantityRules quantityRules,
        Config config) {
=======
        Config config, QuantityRules quantityRules,
        ConsumerContentOverrideCurator consumerContentOverrideCurator,
        ContentCurator contentCurator, OverrideRules overrideRules) {
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        this.consumerCurator = consumerCurator;
        this.consumerTypeCurator = consumerTypeCurator;
Solution content
        ComplianceRules complianceRules, DeletedConsumerCurator deletedConsumerCurator,
        EnvironmentCurator environmentCurator,
        DistributorVersionCurator distributorVersionCurator,
        Config config, QuantityRules quantityRules,
        ConsumerContentOverrideCurator consumerContentOverrideCurator,
        ContentCurator contentCurator, OverrideRules overrideRules,
        CdnCurator cdnCurator) {

        this.consumerCurator = consumerCurator;
        this.consumerTypeCurator = consumerTypeCurator;
File
ConsumerResource.java
Developer's decision
Manual
Kind of conflict
Variable
Chunk
Conflicting content
            this.consumerTypeCurator, null, this.subscriptionService, null,
            this.idCertService, null, this.i18n, this.sink, this.eventFactory, null, null,
            this.userService, null, null, null, this.ownerCurator,
<<<<<<< HEAD
            this.activationKeyCurator,
            null, this.complianceRules, this.deletedConsumerCurator,
            null, null, null, null, new CandlepinCommonTestConfig());
=======
            this.activationKeyCurator, null, this.complianceRules,
            this.deletedConsumerCurator, null, null, new CandlepinCommonTestConfig(),
            null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        hypervisorResource = new HypervisorResource(consumerResource,
            consumerCurator, this.deletedConsumerCurator, i18n);
Solution content
            this.consumerTypeCurator, null, this.subscriptionService, null,
            this.idCertService, null, this.i18n, this.sink, this.eventFactory, null, null,
            this.userService, null, null, null, this.ownerCurator,
            this.activationKeyCurator, null, this.complianceRules,
            this.deletedConsumerCurator, null, null, new CandlepinCommonTestConfig(),
            null, null, null, null, null);

        hypervisorResource = new HypervisorResource(consumerResource,
            consumerCurator, this.deletedConsumerCurator, i18n);
File
HypervisorResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content
            this.userService, null, null, null, this.ownerCurator,
            this.activationKeyCurator,
            null, this.complianceRules, this.deletedConsumerCurator,
<<<<<<< HEAD
            null, null, null, null, this.config);
=======
            null, null, this.config, null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        this.system = initSystem();
Solution content
            this.userService, null, null, null, this.ownerCurator,
            this.activationKeyCurator,
            null, this.complianceRules, this.deletedConsumerCurator,
            null, null, this.config, null, null, null, null, null);

        this.system = initSystem();
File
ConsumerResourceCreationTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(this.consumerCurator, null,
            null, null, this.entitlementCurator, null, null, null, null, null,
            null, null, null, null, this.poolManager, null, null, null,
<<<<<<< HEAD
            null, null, null, null, null, null, null, new CandlepinCommonTestConfig());
=======
            null, null, null, null, null, new CandlepinCommonTestConfig(), null, null,
            null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        Response rsp = consumerResource.bind(
            consumer.getUuid(), pool.getId().toString(), null, 1, null,
Solution content
        ConsumerResource cr = new ConsumerResource(this.consumerCurator, null,
            null, null, this.entitlementCurator, null, null, null, null, null,
            null, null, null, null, this.poolManager, null, null, null,
            null, null, null, null, null, new CandlepinCommonTestConfig(), null, null,
            null, null, null);

        Response rsp = consumerResource.bind(
            consumer.getUuid(), pool.getId().toString(), null, 1, null,
File
ConsumerResourceIntegrationTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
            mockedEntitlementCertServiceAdapter, null, null, null, null, null,
            null, null, mockedPoolManager, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, null, null, new CandlepinCommonTestConfig());
=======
            null, null, null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        List serials = consumerResource
            .getEntitlementCertificateSerials(consumer.getUuid());
Solution content
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
            mockedEntitlementCertServiceAdapter, null, null, null, null, null,
            null, null, mockedPoolManager, null, null, null, null, null,
            null, null, null, new CandlepinCommonTestConfig(), null, null, null,
            null, null);

        List serials = consumerResource
            .getEntitlementCertificateSerials(consumer.getUuid());
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
<<<<<<< HEAD
            mockedEntitlementCertServiceAdapter, null, null, null, null, null,
            null, null, poolManager, null, null, null, null, null,
            null, null, null, null, null, new CandlepinCommonTestConfig());
=======
            mockedEntitlementCertServiceAdapter, null, null, null, null, null, null,
            null, poolManager, null, null, null, null, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.regenerateEntitlementCertificates(consumer.getUuid(), "9999",
            false);
Solution content
        ConsumerResource consumerResource = new ConsumerResource(
            mockedConsumerCurator, null, null, null, mockedEntitlementCurator, null,
            mockedEntitlementCertServiceAdapter, null, null, null, null, null, null,
            null, poolManager, null, null, null, null, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.regenerateEntitlementCertificates(consumer.getUuid(), "9999",
            false);
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content
        CandlepinPoolManager mgr = mock(CandlepinPoolManager.class);
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, mgr, null, null, null, null, null, null, null,
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, mgr, null, null, null, null, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
        cr.regenerateEntitlementCertificates(consumer.getUuid(), null, true);
        Mockito.verify(mgr, Mockito.times(1))
            .regenerateEntitlementCertificates(eq(consumer), eq(true));
Solution content
        CandlepinPoolManager mgr = mock(CandlepinPoolManager.class);
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, null, null, null, null, null, null, null, null,
            null, mgr, null, null, null, null, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null, null);
        cr.regenerateEntitlementCertificates(consumer.getUuid(), null, true);
        Mockito.verify(mgr, Mockito.times(1))
            .regenerateEntitlementCertificates(eq(consumer), eq(true));
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, mockedIdSvc, null, null, sink, factory, null, null,
            null, null, null, null, mockedOwnerCurator, null, null, null, null,
<<<<<<< HEAD
            null, null, null, null, new CandlepinCommonTestConfig());
=======
            null, null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        Consumer fooc = cr.regenerateIdentityCertificates(consumer.getUuid());
Solution content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, mockedIdSvc, null, null, sink, factory, null, null,
            null, null, null, null, mockedOwnerCurator, null, null, null, null,
            null, null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        Consumer fooc = cr.regenerateIdentityCertificates(consumer.getUuid());
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, ssa, null, mockedIdSvc, null, null, sink, factory, null, null,
<<<<<<< HEAD
            null, null, null, null, mockedOwnerCurator, null, null, rules,
            null, null, null, null, null, new CandlepinCommonTestConfig());

=======
            null, null, null, null, mockedOwnerCurator, null, null, rules, null,
            null, null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
        Consumer c = cr.getConsumer(consumer.getUuid());

        assertFalse(origserial.equals(c.getIdCert().getSerial().getSerial()));
Solution content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, ssa, null, mockedIdSvc, null, null, sink, factory, null, null,
            null, null, null, null, mockedOwnerCurator, null, null, rules, null,
            null, null, new CandlepinCommonTestConfig(), null, null, null, null, null);
        Consumer c = cr.getConsumer(consumer.getUuid());

        assertFalse(origserial.equals(c.getIdCert().getSerial().getSerial()));
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content
            consumer);

        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
<<<<<<< HEAD
            null, ssa, null, null, null, null, null, null, null, null,
            null, null, null, null, mockedOwnerCurator, null, null, rules,
            null, null, null, null, null, new CandlepinCommonTestConfig());
=======
            null, ssa, null, null, null, null, null, null, null, null, null, null,
            null, null, mockedOwnerCurator, null, null, rules, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        Consumer c = cr.getConsumer(consumer.getUuid());
Solution content
            consumer);

        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, ssa, null, null, null, null, null, null, null, null, null, null,
            null, null, mockedOwnerCurator, null, null, rules, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null, null);

        Consumer c = cr.getConsumer(consumer.getUuid());
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(null, ctc,
            null, null, null, null, null, i18n, null, null, null, null,
            null, null, null, null, oc, akc, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
        cr.create(c, nap, null, "testOwner", "testKey");
    }
Solution content
        ConsumerResource cr = new ConsumerResource(null, ctc,
            null, null, null, null, null, i18n, null, null, null, null,
            null, null, null, null, oc, akc, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);
        cr.create(c, nap, null, "testOwner", "testKey");
    }
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
                .thenThrow(new RuntimeException());

            ConsumerResource cr = new ConsumerResource(cc, null,
<<<<<<< HEAD
                null, sa, null, null, null, i18n, null, null, null, null,
                null, null, null, null, null, null, e, null, null, null,
                null, null, null, new CandlepinCommonTestConfig());
=======
                null, sa, null, null, null, i18n, null, null, null, null, null,
                null, null, null, null, null, e, null, null, null, null,
                new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
            cr.bind("fakeConsumer", null, prodIds, null, null, null, false, null);
        }
        catch (Throwable t) {
Solution content
                .thenThrow(new RuntimeException());

            ConsumerResource cr = new ConsumerResource(cc, null,
                null, sa, null, null, null, i18n, null, null, null, null, null,
                null, null, null, null, null, e, null, null, null, null,
                new CandlepinCommonTestConfig(), null, null, null, null, null);
            cr.bind("fakeConsumer", null, prodIds, null, null, null, false, null);
        }
        catch (Throwable t) {
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content
        when(sa.hasUnacceptedSubscriptionTerms(eq(o))).thenReturn(false);
        when(cc.findByUuid(eq("fakeConsumer"))).thenReturn(c);

<<<<<<< HEAD
        ConsumerResource cr = new ConsumerResource(cc, null,
            null, sa, null, null, null, null, null, null, null, null,
            null, null, null, null, null, null, e, null, null, null,
            null, null, null, new CandlepinCommonTestConfig());
=======
        ConsumerResource cr = new ConsumerResource(cc, null, null, sa,
            null, null, null, null, null, null, null, null, null, null,
            null, null, null, null, e, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
        String dtStr = "2011-09-26T18:10:50.184081+00:00";
        Date dt = ResourceDateParser.parseDateString(dtStr);
        cr.bind("fakeConsumer", null, null, null, null, null, false, dtStr);
Solution content
        when(sa.hasUnacceptedSubscriptionTerms(eq(o))).thenReturn(false);
        when(cc.findByUuid(eq("fakeConsumer"))).thenReturn(c);

        ConsumerResource cr = new ConsumerResource(cc, null, null, sa,
            null, null, null, null, null, null, null, null, null, null,
            null, null, null, null, e, null, null, null, null,
            new CandlepinCommonTestConfig(), null, null, null, null, null);
        String dtStr = "2011-09-26T18:10:50.184081+00:00";
        Date dt = ResourceDateParser.parseDateString(dtStr);
        cr.bind("fakeConsumer", null, null, null, null, null, false, dtStr);
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, entitlementCurator, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.unbindBySerial("fake uuid",
            Long.valueOf(1234L));
Solution content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, entitlementCurator, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.unbindBySerial("fake uuid",
            Long.valueOf(1234L));
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null, null,
            null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.unbindBySerial("fake uuid",
            Long.valueOf(1234L));
Solution content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null, null,
            null, null, null, null, null, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.unbindBySerial("fake uuid",
            Long.valueOf(1234L));
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.bind("fake uuid", "fake pool uuid",
            new String[]{"12232"}, 1, null, null, false, null);
Solution content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.bind("fake uuid", "fake pool uuid",
            new String[]{"12232"}, 1, null, null, false, null);
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.bind("notarealuuid", "fake pool uuid", null, null, null,
            null, false, null);
Solution content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.bind("notarealuuid", "fake pool uuid", null, null, null,
            null, false, null);
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        consumerResource.regenerateEntitlementCertificates("xyz", null, true);
    }
Solution content
        ConsumerResource consumerResource = new ConsumerResource(consumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);

        consumerResource.regenerateEntitlementCertificates("xyz", null, true);
    }
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(null, ctc,
            null, null, null, null, null, i18n, null, null, null, null,
            usa, null, null,  null, oc, null, null, null, null, null,
<<<<<<< HEAD
            null, null, null, new CandlepinCommonTestConfig());
=======
            null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321
        cr.create(c, up, null, "testOwner", null);
    }
Solution content
        ConsumerResource cr = new ConsumerResource(null, ctc,
            null, null, null, null, null, i18n, null, null, null, null,
            usa, null, null,  null, oc, null, null, null, null, null,
            null, new CandlepinCommonTestConfig(), null, null, null, null, null);
        cr.create(c, up, null, "testOwner", null);
    }
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, mockedComplianceRules,
<<<<<<< HEAD
            null, null, null, null, null, new CandlepinCommonTestConfig());
=======
            null, null, null, new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        Map results = cr.getComplianceStatusList(uuids);
        verify(c).setEntitlementStatus(status.getStatus());
Solution content
        ConsumerResource cr = new ConsumerResource(mockedConsumerCurator, null,
            null, null, null, null, null, i18n, null, null, null,
            null, null, null, null, null, null, null, null, mockedComplianceRules,
            null, null, null, new CandlepinCommonTestConfig(), null, null, null,
            null, null);

        Map results = cr.getComplianceStatusList(uuids);
        verify(c).setEntitlementStatus(status.getStatus());
File
ConsumerResourceTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content
            this.consumerTypeCurator, null, this.subscriptionService, null,
            this.idCertService, null, this.i18n, this.sink, this.eventFactory, null, null,
            this.userService, null, poolManager, null, null,
<<<<<<< HEAD
            this.activationKeyCurator,
            this.entitler, this.complianceRules, this.deletedConsumerCurator,
            this.environmentCurator, null, null, null, new CandlepinCommonTestConfig());
=======
            this.activationKeyCurator, this.entitler, this.complianceRules,
            this.deletedConsumerCurator, this.environmentCurator, null,
            new CandlepinCommonTestConfig(), null, null, null, null);
>>>>>>> c5c9be0ead4e080c08313a1df3f7ac26fce59321

        when(complianceRules.getStatus(any(Consumer.class), any(Date.class)))
            .thenReturn(new ComplianceStatus(new Date()));
Solution content
            this.consumerTypeCurator, null, this.subscriptionService, null,
            this.idCertService, null, this.i18n, this.sink, this.eventFactory, null, null,
            this.userService, null, poolManager, null, null,
            this.activationKeyCurator, this.entitler, this.complianceRules,
            this.deletedConsumerCurator, this.environmentCurator, null,
            new CandlepinCommonTestConfig(), null, null, null, null, null);

        when(complianceRules.getStatus(any(Consumer.class), any(Date.class)))
            .thenReturn(new ComplianceStatus(new Date()));
File
ConsumerResourceUpdateTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation