Projects >> atlas-model >>320a5335b62a2e4e053ca74e3cf5c08f7c0c48da

Chunk
Conflicting content 
    FILTERING_RESOURCE,
    CHANNEL,
    PRODUCTS,
<<<<<<< HEAD
    PUBLISHER,
    RECENTLY_BROADCAST,
    CHANNELS;
=======
    RECENTLY_BROADCAST,
    CHANNELS,
    PUBLISHER;
>>>>>>> 0ebabd580419f051c547bc1315a52391e46fd222
    
    private static final ImmutableSet defaultAnnotations = ImmutableSet.of(
        DESCRIPTION,
Solution content 
    FILTERING_RESOURCE,
    CHANNEL,
    PRODUCTS,
    PUBLISHER,
    RECENTLY_BROADCAST,
    CHANNELS;
    
    private static final ImmutableSet defaultAnnotations = ImmutableSet.of(
        DESCRIPTION,
File
Annotation.java
Developer's decision
Version 1
Kind of conflict
Enum value
Chunk
Conflicting content 
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.fasterxml.jackson.datatype.guava.GuavaModule;
<<<<<<< HEAD
import com.fasterxml.jackson.datatype.joda.JodaModule;
import java.util.Collections;
import org.atlasapi.serialization.json.configuration.messaging.MessagingModule;
import org.atlasapi.serialization.json.configuration.model.FilteredContainerConfiguration;
import org.atlasapi.serialization.json.configuration.model.FilteredItemConfiguration;
import org.atlasapi.serialization.json.configuration.model.ModelModule;
=======
import com.metabroadcast.common.intl.Country;
>>>>>>> 0ebabd580419f051c547bc1315a52391e46fd222

/**
 */
Solution content 
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.fasterxml.jackson.datatype.guava.GuavaModule;
import com.fasterxml.jackson.datatype.joda.JodaModule;

/**
 */
File
JsonFactory.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
            
            super.setupModule(context);
            context.setMixInAnnotations(Object.class, ObjectConfiguration.class);
<<<<<<< HEAD
        }
    }
    
    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
    private static interface ObjectConfiguration {
    }
}
=======
            //
            context.setMixInAnnotations(Container.class, ContainerConfiguration.class);
            context.setMixInAnnotations(Item.class, ItemConfiguration.class);
            context.setMixInAnnotations(Broadcast.class, BroadcastConfiguration.class);
            context.setMixInAnnotations(Country.class, CountryConfiguration.class);
            context.setMixInAnnotations(RelatedLink.class, RelatedLinkConfiguration.class);
            context.setMixInAnnotations(ParentRef.class, ParentRefConfiguration.class);
            context.setMixInAnnotations(ChildRef.class, ChildRefConfiguration.class);
            context.setMixInAnnotations(EquivalenceSummary.class, EquivalenceSummaryConfiguration.class);
            context.setMixInAnnotations(ContentRef.class, ContentRefConfiguration.class);
        }
    }
    
}
>>>>>>> 0ebabd580419f051c547bc1315a52391e46fd222
Solution content 
            
            super.setupModule(context);
            context.setMixInAnnotations(Object.class, ObjectConfiguration.class);
        }
    }
    
    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
    private static interface ObjectConfiguration {
    }
}
File
JsonFactory.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Interface declaration
Method invocation