Projects >> atlas >>1fbe14b1ffdd607261e30ea0dd334a58d1f59199

Chunk
Conflicting content 
    }

        org.atlasapi.media.entity.simple.Restriction simpleRestriction = broadcast.getRestriction();

<<<<<<< HEAD
        restriction = setPropertiesForRestriction(restriction, simpleRestriction);

        return restriction;
    }

=======
        setPropertiesForRestriction(restriction, simpleRestriction);


        return restriction;
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
    private Restriction createRestrictionForLocation(org.atlasapi.media.entity.simple.Location location) {
        Restriction restriction = new Restriction();
Solution content 
        org.atlasapi.media.entity.simple.Restriction simpleRestriction = broadcast.getRestriction();

        setPropertiesForRestriction(restriction, simpleRestriction);


        return restriction;
    }
    private Restriction createRestrictionForLocation(org.atlasapi.media.entity.simple.Location location) {
        Restriction restriction = new Restriction();

        org.atlasapi.media.entity.simple.Restriction simpleRestriction = location.getRestriction();
        restriction = setPropertiesForRestriction(restriction, simpleRestriction);

        return restriction;
    }

    private Restriction setPropertiesForRestriction(Restriction restriction,
                                                    org.atlasapi.media.entity.simple.Restriction simpleRestriction) {
        restriction = setPropertiesForRestriction(restriction, simpleRestriction);

        return restriction;
    }

    private Restriction createRestrictionForLocation(org.atlasapi.media.entity.simple.Location location) {
        Restriction restriction = new Restriction();
File
ItemModelTransformer.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        Restriction restriction = new Restriction();

        org.atlasapi.media.entity.simple.Restriction simpleRestriction = location.getRestriction();
<<<<<<< HEAD

=======
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        restriction = setPropertiesForRestriction(restriction, simpleRestriction);

        return restriction;
Solution content 
        Restriction restriction = new Restriction();

        org.atlasapi.media.entity.simple.Restriction simpleRestriction = location.getRestriction();

        restriction = setPropertiesForRestriction(restriction, simpleRestriction);

        return restriction;
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        return restriction;
    }

<<<<<<< HEAD
    private Restriction setPropertiesForRestriction(Restriction restriction, org.atlasapi.media.entity.simple.Restriction simpleRestriction) {
=======
    private Restriction setPropertiesForRestriction(Restriction restriction,
                                                    org.atlasapi.media.entity.simple.Restriction simpleRestriction) {
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        if (simpleRestriction != null) {
            restriction.setRestricted(simpleRestriction.isRestricted());
            restriction.setAuthority(simpleRestriction.getAuthority());
Solution content 
        return restriction;
    }

    private Restriction setPropertiesForRestriction(Restriction restriction, org.atlasapi.media.entity.simple.Restriction simpleRestriction) {
        if (simpleRestriction != null) {
            restriction.setRestricted(simpleRestriction.isRestricted());
            restriction.setAuthority(simpleRestriction.getAuthority());
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
        return restriction;
    }

<<<<<<< HEAD
=======

    // Since we are coalescing multiple broadcasts each with possibly its own restriction there is
    // no good way decide which restriction to keep so we are keeping the first one
    private void setToFirstRestriction(Version version, Set restrictions) {
        Iterator iterator = restrictions.iterator();
        if(!iterator.hasNext()) {
            return;
        }
        version.setRestriction(iterator.next());
    }

>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
    private Set encodingsFrom(Set locations, DateTime now) {
        Builder encodings = ImmutableSet.builder();
        for (org.atlasapi.media.entity.simple.Location simpleLocation : locations) {
Solution content 
    }

        return restriction;
    private Set encodingsFrom(Set locations, DateTime now) {
        Builder encodings = ImmutableSet.builder();
        for (org.atlasapi.media.entity.simple.Location simpleLocation : locations) {
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        encoding.setVideoProgressiveScan(inputLocation.getVideoProgressiveScan());
        encoding.setVideoVerticalSize(inputLocation.getVideoVerticalSize());
        encoding.setHighDefinition(inputLocation.getHighDefinition());
<<<<<<< HEAD

=======
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        return encoding;
    }
Solution content 
        encoding.setVideoProgressiveScan(inputLocation.getVideoProgressiveScan());
        encoding.setVideoVerticalSize(inputLocation.getVideoVerticalSize());
        encoding.setHighDefinition(inputLocation.getHighDefinition());
        return encoding;
    }
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        if (inputLocation.getTransportType() != null) {
            location.setTransportType(TransportType.fromString(inputLocation.getTransportType()));
        }
<<<<<<< HEAD

=======
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        Set restrictions = Sets.newHashSet();
        Version version = new Version();
Solution content 
        if (inputLocation.getTransportType() != null) {
            location.setTransportType(TransportType.fromString(inputLocation.getTransportType()));
        }
        Set restrictions = Sets.newHashSet();
        Version version = new Version();
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        restrictions.add(createRestrictionForLocation(inputLocation));

        setToFirstRestriction(version, restrictions);
<<<<<<< HEAD

=======
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        return location;
    }
Solution content 
        restrictions.add(createRestrictionForLocation(inputLocation));

        setToFirstRestriction(version, restrictions);
        return location;
    }
File
ItemModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    public void testTransformItemWithBroadcastVersionsTransformsAllVersionFields()
            throws Exception {
        simpleItem.setShortDescription("H");
<<<<<<< HEAD
=======
        simpleItem.setMediumDescription("Hello");
        simpleItem.setLongDescription("Hello World");
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        org.atlasapi.media.entity.Item complex = transformer.transform(simpleItem);

        assertThat(complex.getVersions().size(), is(1));
Solution content 
    public void testTransformItemWithBroadcastVersionsTransformsAllVersionFields()
            throws Exception {
        simpleItem.setShortDescription("H");
        simpleItem.setMediumDescription("Hello");
        simpleItem.setLongDescription("Hello World");
        org.atlasapi.media.entity.Item complex = transformer.transform(simpleItem);

        assertThat(complex.getVersions().size(), is(1));
File
ItemModelTransformerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        assertThat(complex.getVersions().size(), is(1));
        assertThat(simpleItem.getShortDescription(), is(complex.getShortDescription()));
<<<<<<< HEAD
=======
        assertThat(simpleItem.getMediumDescription(), is(complex.getMediumDescription()));
        assertThat(simpleItem.getLongDescription(), is(complex.getLongDescription()));
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab

        Version version = complex.getVersions().iterator().next();
        checkRestriction(version.getRestriction());
Solution content 
        assertThat(complex.getVersions().size(), is(1));
        assertThat(simpleItem.getShortDescription(), is(complex.getShortDescription()));
        assertThat(simpleItem.getMediumDescription(), is(complex.getMediumDescription()));
        assertThat(simpleItem.getLongDescription(), is(complex.getLongDescription()));

        Version version = complex.getVersions().iterator().next();
        checkRestriction(version.getRestriction());
File
ItemModelTransformerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        fullItem.setShortDescription("Hello");
        fullItem.setMediumDescription("Hello World");
        fullItem.setLongDescription("Hello World Test");
<<<<<<< HEAD

=======
        
>>>>>>> 493d27d31aa60c7740fcd3a26801cbac75d2e8ab
        CrewMember person = Actor.actor("hisID", "Andrew Collings", "Dirt-bag Humperdink", Publisher.BBC);
        fullItem.addPerson(person);
Solution content 
        fullItem.setShortDescription("Hello");
        fullItem.setMediumDescription("Hello World");
        fullItem.setLongDescription("Hello World Test");

        CrewMember person = Actor.actor("hisID", "Andrew Collings", "Dirt-bag Humperdink", Publisher.BBC);
        fullItem.addPerson(person);
File
ItemModelSimplifierTest.java
Developer's decision
Version 1
Kind of conflict
Blank