Projects >> goci >>9da90c520d3d5a4883a47211a2c3ac74d75f159b

Chunk
Conflicting content 
    private CurationStatusRepository curationStatusRepository;

    @Autowired
<<<<<<< HEAD
    public StudyController(StudyRepository studyRepository, AssociationRepository associationRepository, HousekeepingRepository housekeepingRepository, DiseaseTraitRepository diseaseTraitRepository, EfoTraitRepository efoTraitRepository, CuratorRepository curatorRepository, CurationStatusRepository curationStatusRepository) {
=======
    public StudyController(StudyRepository studyRepository, HousekeepingRepository housekeepingRepository, DiseaseTraitRepository diseaseTraitRepository, EFOTraitRepository efoTraitRepository, CuratorRepository curatorRepository, CurationStatusRepository curationStatusRepository) {
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
        this.studyRepository = studyRepository;
        this.housekeepingRepository = housekeepingRepository;
        this.diseaseTraitRepository = diseaseTraitRepository;
Solution content 
    @Autowired
    private CurationStatusRepository curationStatusRepository;
    public StudyController(StudyRepository studyRepository,
                           HousekeepingRepository housekeepingRepository,
                           DiseaseTraitRepository diseaseTraitRepository,
                           EfoTraitRepository efoTraitRepository,
                           CuratorRepository curatorRepository,
                           CurationStatusRepository curationStatusRepository) {
        this.studyRepository = studyRepository;
        this.housekeepingRepository = housekeepingRepository;
        this.diseaseTraitRepository = diseaseTraitRepository;
File
StudyController.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
    }


<<<<<<< HEAD
    /* Study SNP/Associations */

    // Generate list of SNP associations linked to a study
    @RequestMapping(value = "/{studyId}/associations", produces = MediaType.TEXT_HTML_VALUE, method = RequestMethod.GET)
    public String viewStudySnps(Model model, @PathVariable String studyId) {

        Collection associations = new ArrayList<>();
        associations.addAll(associationRepository.findByStudyId(Long.parseLong(studyId)));
        model.addAttribute("studyAssociations", associations);

        // Also passes back study object to view so we can create links back to main study page
        model.addAttribute("study", studyRepository.findOne(Long.valueOf(studyId)));
        return "study_association";
    }


=======
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    /* Study housekeeping/curator information */

    // Generate page with housekeeping/curator information linked to a study
Solution content 
    }


    /* Study SNP/Associations */

    // Generate list of SNP associations linked to a study
    @RequestMapping(value = "/{studyId}/associations", produces = MediaType.TEXT_HTML_VALUE, method = RequestMethod.GET)
    public String viewStudySnps(Model model, @PathVariable String studyId) {

        Collection associations = new ArrayList<>();
        associations.addAll(associationRepository.findByStudyId(Long.parseLong(studyId)));
        model.addAttribute("studyAssociations", associations);

        // Also passes back study object to view so we can create links back to main study page
        model.addAttribute("study", studyRepository.findOne(Long.valueOf(studyId)));
        return "study_association";
    }


    /* Study housekeeping/curator information */

    // Generate page with housekeeping/curator information linked to a study
File
StudyController.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
package uk.ac.ebi.spot.goci.curation.model;

<<<<<<< HEAD
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotNull;
=======
import javax.persistence.*;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
import java.util.Collection;

/**
Solution content 
package uk.ac.ebi.spot.goci.curation.model;

import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.util.Collection;

/**
File
Association.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
public class Association {
    @Id
    @GeneratedValue
<<<<<<< HEAD
    @NotNull
    private Long id;

=======
    @Column(name = "ID")
    private Long id;

    @Column(name = "STUDYID")
    private String studyID;

    @Column(name = "GENE")
    private String authorReportedGene;

    @Column(name = "STRONGESTALLELE")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private String strongestAllele;

    private String riskFrequency;
Solution content 
public class Association {
    @Id
    @GeneratedValue
    @NotNull
    private Long id;

    private String authorReportedGene;
    
    private String strongestAllele;

    private String riskFrequency;
File
Association.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    private String snpType;

<<<<<<< HEAD
=======
    @Column(name = "SNPHAPLOTYPE")
    private String multiSNPHaplotype;

    @Column(name = "SNPINTERACTION")
    private String snpInteraction;

    @Column(name = "PVALUE_MANTISSA")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private Integer pvalueMantissa;

    private Integer pvalueExponent;
Solution content 
    private String snpType;

    private String multiSnpHaplotype;

    private String snpInteraction;

    private Integer pvalueMantissa;

    private Integer pvalueExponent;
File
Association.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    private String orPerCopyUnitDescr;

<<<<<<< HEAD
    @OneToOne
    private Study study;

    @OneToOne
    private SingleNucleotidePolymorphism snp;
=======
    // Associated SNP(s)
    @ManyToMany(fetch = FetchType.LAZY)
    @JoinTable(
            name = "GWASSNPXREF",
            joinColumns = {@JoinColumn(name = "GWASSTUDIESSNPID", referencedColumnName = "ID")},
            inverseJoinColumns = {@JoinColumn(name = "SNPID", referencedColumnName = "ID")}
    )
    private Collection snps;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f

    @OneToMany
    @JoinTable(name = "ASSOCIATION_REPORTED_GENE",
Solution content 
    private String orPerCopyUnitDescr;

    @OneToOne
    private Study study;

    @OneToOne
    private SingleNucleotidePolymorphism snp;

    @OneToMany
    @JoinTable(name = "ASSOCIATION_REPORTED_GENE",
File
Association.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Comment
Chunk
Conflicting content 
    public Association() {
    }

<<<<<<< HEAD
    public Association(String strongestAllele,
                       String riskFrequency,
                       String allele,
                       float pvalueFloat,
                       String pvalueText,
                       Double ORPerCopyNum,
                       String ORType,
                       String snpType,
                       Integer pvalueMantissa,
                       Integer pvalueExponent,
                       Double ORPerCopyRecip,
                       Double ORPerCopyStdError,
                       String ORPerCopyRange,
                       String ORPerCopyUnitDescr,
                       Study study,
                       SingleNucleotidePolymorphism snp,
                       Collection reportedGenes,
                       Collection efoTraits) {
=======
    public Association(String studyID, String authorReportedGene, String strongestAllele, String riskFrequency, String allele, float pvalueFloat, String pvalueText, Double ORPerCopyNum, String ORType, String snpType, String multiSNPHaplotype, String snpInteraction, Integer pvalueMantissa, Integer pvalueExponent, Double ORPerCopyRecip, Double ORPerCopyStdError, String ORPerCopyRange, String ORPerCopyUnitDescr, Collection snps, Collection efoTraits) {
        this.studyID = studyID;
        this.authorReportedGene = authorReportedGene;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
        this.strongestAllele = strongestAllele;
        this.riskFrequency = riskFrequency;
        this.allele = allele;
Solution content 
    public Association() {
    }

    public Association(String strongestAllele,
                       String riskFrequency,
                       String allele,
                       String authorReportedGene,
                       float pvalueFloat,
                       String pvalueText,
                       Double ORPerCopyNum,
                       String ORType,
                       String snpType,
                       String multiSnpHaplotype,
                       String snpInteraction, 
                       Integer pvalueMantissa,
                       Integer pvalueExponent,
                       Double ORPerCopyRecip,
                       Double ORPerCopyStdError,
                       String ORPerCopyRange,
                       String ORPerCopyUnitDescr,
                       Study study,
                       SingleNucleotidePolymorphism snp,
                       Collection reportedGenes,
                       Collection efoTraits) {
        this.authorReportedGene = authorReportedGene;
        this.strongestAllele = strongestAllele;
        this.riskFrequency = riskFrequency;
        this.allele = allele;
File
Association.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
        this.id = id;
    }

        return id;
    }

<<<<<<< HEAD
=======
    public void setId(Long id) {
    public String getStudyID() {
        return studyID;
    }

    public void setStudyID(String studyID) {
        this.studyID = studyID;
    }

    public String getAuthorReportedGene() {
        return authorReportedGene;
    }

    public void setAuthorReportedGene(String authorReportedGene) {
        this.authorReportedGene = authorReportedGene;
    }

>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    public String getStrongestAllele() {
        return strongestAllele;
    }
Solution content 
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getAuthorReportedGene() {
        return authorReportedGene;
    }

    public void setAuthorReportedGene(String authorReportedGene) {
        this.authorReportedGene = authorReportedGene;
    }

    public String getStrongestAllele() {
        return strongestAllele;
    }
File
Association.java
Developer's decision
Combination
Kind of conflict
Method declaration
Chunk
Conflicting content 
        return pvalueText;
    }

<<<<<<< HEAD
    public Double getOrPerCopyNum() {
        return orPerCopyNum;
    }

    public String getOrType() {
        return orType;
=======
    public void setPvalueText(String pvalueText) {
        this.pvalueText = pvalueText;
    }

    public Double getORPerCopyNum() {
        return ORPerCopyNum;
    }

    public void setORPerCopyNum(Double ORPerCopyNum) {
        this.ORPerCopyNum = ORPerCopyNum;
    }

    public String getORType() {
        return ORType;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    }

    public void setORType(String ORType) {
Solution content 
        return pvalueText;
    }

    public void setPvalueText(String pvalueText) {
        this.pvalueText = pvalueText;
    }

    public Double getOrPerCopyNum() {
        return orPerCopyNum;
    }

    public void setOrPerCopyNum(Double orPerCopyNum) {
        this.orPerCopyNum = orPerCopyNum;
    }

    public String getOrType() {
        return orType;
    }
File
Association.java
Developer's decision
Manual
Kind of conflict
Attribute
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
        return pvalueExponent;
    }

<<<<<<< HEAD
    public Double getOrPerCopyRecip() {
        return orPerCopyRecip;
    }

    public Double getOrPerCopyStdError() {
        return orPerCopyStdError;
    }

    public String getOrPerCopyRange() {
        return orPerCopyRange;
    }

    public String getOrPerCopyUnitDescr() {
        return orPerCopyUnitDescr;
    }

    public Study getStudy() {
        return study;
    }

    public SingleNucleotidePolymorphism getSnp() {
        return snp;
    }

    public Collection getReportedGenes() {
        return reportedGenes;
    }

    public Collection getEfoTraits() {
=======
    public void setPvalueExponent(Integer pvalueExponent) {
        this.pvalueExponent = pvalueExponent;
    }

    public Double getORPerCopyRecip() {
        return ORPerCopyRecip;
    }

    public void setORPerCopyRecip(Double ORPerCopyRecip) {
        this.ORPerCopyRecip = ORPerCopyRecip;
    }

    public Double getORPerCopyStdError() {
        return ORPerCopyStdError;
    }

    public void setORPerCopyStdError(Double ORPerCopyStdError) {
        this.ORPerCopyStdError = ORPerCopyStdError;
    }

    public String getORPerCopyRange() {
        return ORPerCopyRange;
    }

    public void setORPerCopyRange(String ORPerCopyRange) {
        this.ORPerCopyRange = ORPerCopyRange;
    }

    public String getORPerCopyUnitDescr() {
        return ORPerCopyUnitDescr;
    }

    public void setORPerCopyUnitDescr(String ORPerCopyUnitDescr) {
        this.ORPerCopyUnitDescr = ORPerCopyUnitDescr;
    }

    public Collection getSnps() {
        return snps;
    }

    public void setSnps(Collection snps) {
        this.snps = snps;
    }

    public Collection getEfoTraits() {
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
        return efoTraits;
    }
Solution content 
        return pvalueExponent;
    }

    public void setPvalueExponent(Integer pvalueExponent) {
        this.pvalueExponent = pvalueExponent;
    }

    public Double getOrPerCopyRecip() {
        return orPerCopyRecip;
    }

    public void setOrPerCopyRecip(Double orPerCopyRecip) {
        this.orPerCopyRecip = orPerCopyRecip;
    }

    public Double getOrPerCopyStdError() {
        return orPerCopyStdError;
    }

    public void setOrPerCopyStdError(Double orPerCopyStdError) {
        this.orPerCopyStdError = orPerCopyStdError;
    }

    public String getOrPerCopyRange() {
        return orPerCopyRange;
    }

    public void setOrPerCopyRange(String orPerCopyRange) {
        this.orPerCopyRange = orPerCopyRange;
    }

    public String getOrPerCopyUnitDescr() {
        return orPerCopyUnitDescr;
    }

    public void setOrPerCopyUnitDescr(String orPerCopyUnitDescr) {
        this.orPerCopyUnitDescr = orPerCopyUnitDescr;
    }

    public Study getStudy() {
        return study;
    }

    public void setStudy(Study study) {
        this.study = study;
    }

    public SingleNucleotidePolymorphism getSnp() {
        return snp;
    }

    public void setSnp(SingleNucleotidePolymorphism snp) {
        this.snp = snp;
    }

    public Collection getReportedGenes() {
        return reportedGenes;
    }

    public void setReportedGenes(Collection reportedGenes) {
        this.reportedGenes = reportedGenes;
    }

    public Collection getEfoTraits() {
        return efoTraits;
    }
File
Association.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method signature
Chunk
Conflicting content 
    public String toString() {
        return "Association{" +
                "id=" + id +
<<<<<<< HEAD
                ", study='" + study + '\'' +
=======
                ", studyID='" + studyID + '\'' +
                ", authorReportedGene='" + authorReportedGene + '\'' +
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
                ", strongestAllele='" + strongestAllele + '\'' +
                ", riskFrequency='" + riskFrequency + '\'' +
                ", allele='" + allele + '\'' +
Solution content 
    public String toString() {
        return "Association{" +
                "id=" + id +
                ", study='" + study + '\'' +
                ", strongestAllele='" + strongestAllele + '\'' +
                ", riskFrequency='" + riskFrequency + '\'' +
                ", allele='" + allele + '\'' +
File
Association.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
package uk.ac.ebi.spot.goci.curation.model;

<<<<<<< HEAD
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;
=======
import javax.persistence.*;
import java.util.Collection;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f

/**
 * Created by emma on 01/12/14.
Solution content 
package uk.ac.ebi.spot.goci.curation.model;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;

/**
 * Created by emma on 01/12/14.
File
Gene.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
public class Gene {
    @Id
    @GeneratedValue
<<<<<<< HEAD
    @NotNull
=======
    @Column(name = "ID")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private Long id;

    private String geneName;
Solution content 
public class Gene {
    @Id
    @GeneratedValue
    @NotNull
    private Long id;

    private String geneName;
File
Gene.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
    private String geneName;

<<<<<<< HEAD
=======
    // TODO EACH GENE WILL BE LINKED TO NUMBER OF SNPS, OVERENGINEERING????
    //Association with SNPs
    @ManyToMany(mappedBy = "genes", fetch = FetchType.LAZY)
    private Collection snps;

>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    // JPA no-args constructor
    public Gene() {
    }
Solution content 
    private String geneName;

    // JPA no-args constructor
    public Gene() {
    }
File
Gene.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Comment
Chunk
Conflicting content 
        return geneName;
    }

<<<<<<< HEAD
=======
    public void setGeneName(String geneName) {
        this.geneName = geneName;
    }

    public Collection getSnps() {
        return snps;
    }

    public void setSnps(Collection snps) {
        this.snps = snps;
    }

>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    @Override
    public String toString() {
        return "Gene{" +
Solution content 
        return geneName;
    }

    public void setGeneName(String geneName) {
        this.geneName = geneName;
    }

    @Override
    public String toString() {
        return "Gene{" +
File
Gene.java
Developer's decision
Combination
Kind of conflict
Method declaration
Chunk
Conflicting content 
package uk.ac.ebi.spot.goci.curation.model;

<<<<<<< HEAD
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;
=======
import javax.persistence.*;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f

/**
 * Created by emma on 01/12/14.
Solution content 
package uk.ac.ebi.spot.goci.curation.model;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;

/**
 * Created by emma on 01/12/14.
File
Region.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 *
 * @author emma
 *         

<<<<<<< HEAD
 *         Model of name information associated with a SNP
=======
 *         Model of region information associated with a SNP
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
 */
@Entity
public class Region {
Solution content 
 *
 * @author emma
 *         

 *         Model of name information associated with a SNP
 */
@Entity
public class Region {
File
Region.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
public class Region {
    @Id
    @GeneratedValue
<<<<<<< HEAD
    @NotNull
=======
    @Column(name = "ID")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private Long id;

    private String name;
Solution content 
public class Region {
    @Id
    @GeneratedValue
    @NotNull
    private Long id;

    private String name;
File
Region.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
        return id;
    }

<<<<<<< HEAD
    public String getName() {
        return name;
=======
    public void setId(Long id) {
        this.id = id;
    }

    public String getRegion() {
        return region;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    }

    public void setRegion(String region) {
Solution content 
        return id;
    }

    public String getName() {
        return name;
    }

    @Override
    public String toString() {
        return "Region{" +
                "id=" + id +
                ", name='" + name + '\'' +
                '}';
    }
}
File
Region.java
Developer's decision
Manual
Kind of conflict
Attribute
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
package uk.ac.ebi.spot.goci.curation.model;

<<<<<<< HEAD
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotNull;
=======
import javax.persistence.*;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
import java.sql.Timestamp;
import java.util.Collection;
Solution content 
package uk.ac.ebi.spot.goci.curation.model;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotNull;
import java.sql.Timestamp;
import java.util.Collection;
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 * Created by emma on 21/11/14.
 *
 * @author emma
<<<<<<< HEAD
 *         

=======
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
 *         Model object representing a single nucleotide polymorphisms and its attributes
 */
Solution content 
 * Created by emma on 21/11/14.
 *
 * @author emma
 *         

 *         Model object representing a single nucleotide polymorphisms and its attributes
 */
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
public class SingleNucleotidePolymorphism {
    @Id
    @GeneratedValue
<<<<<<< HEAD
    @NotNull
=======
    @Column(name = "ID")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private Long id;

    private String rsId;
Solution content 
public class SingleNucleotidePolymorphism {
    @Id
    @GeneratedValue
    @NotNull
    private Long id;

    private String rsId;
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
    private String rsId;

<<<<<<< HEAD
=======
    // TODO ADD THESE ONCE TABLE IS ACTIVE
    @Column(name = "CHROMOSOME_NAME")
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private String chromosomeName;

    private String chromosomePosition;
Solution content 
    private String rsId;

    private String chromosomeName;

    private String chromosomePosition;
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Chunk
Conflicting content 
    private String chromosomePosition;

<<<<<<< HEAD
    private Timestamp lastUpdateDate;

    @OneToOne
    private Region region;

    @ManyToMany
    @JoinTable(name = "SNP_GENE",
               joinColumns = @JoinColumn(name = "SNP_ID"),
               inverseJoinColumns = @JoinColumn(name = "GENE_ID"))
=======
    @Column(name = "LASTUPDATEDATE")
    private Timestamp lastUpdateDate;

    // TODO HOW DO WE DEFINE RELATIONSHIP WITH GENE AND REGION
    // Associated region
  /*  @OneToOne(fetch = FetchType.LAZY)
    @JoinTable(
            name = "GWASREGIONXREF",
            joinColumns = {@JoinColumn(name = "GWASSNPID", referencedColumnName = "ID")},
            inverseJoinColumns = {@JoinColumn(name = "REGIONID", referencedColumnName = "ID")}
    )
    private Region region;*/

    // Associated genes
 @ManyToMany
    @JoinTable(
            name = "GWASGENEXREF",
            joinColumns = {@JoinColumn(name = "GWASSNPID", referencedColumnName = "ID")},
            inverseJoinColumns = {@JoinColumn(name = "GENEID", referencedColumnName = "ID")}
    )
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    private Collection genes;

    // JPA no-args constructor
Solution content 
    private String chromosomePosition;

    private Timestamp lastUpdateDate;

    @OneToOne
    private Region region;

    @ManyToMany
    @JoinTable(name = "SNP_GENE",
               joinColumns = @JoinColumn(name = "SNP_ID"),
               inverseJoinColumns = @JoinColumn(name = "GENE_ID"))
    private Collection genes;

    // JPA no-args constructor
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Comment
Chunk
Conflicting content 
    public SingleNucleotidePolymorphism() {
    }

<<<<<<< HEAD
    public SingleNucleotidePolymorphism(String rsId,
                                        String chromosomeName,
                                        String chromosomePosition,
                                        Timestamp lastUpdateDate,
                                        Region region,
                                        Collection genes) {
        this.rsId = rsId;
=======
    public SingleNucleotidePolymorphism(String rsID, String chromosomeName, String chromosomePosition, Timestamp lastUpdateDate) {
        this.rsID = rsID;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
        this.chromosomeName = chromosomeName;
        this.chromosomePosition = chromosomePosition;
        this.lastUpdateDate = lastUpdateDate;
Solution content 
    public SingleNucleotidePolymorphism() {
    }

    public SingleNucleotidePolymorphism(String rsId,
                                        String chromosomeName,
                                        String chromosomePosition,
                                        Timestamp lastUpdateDate,
                                        Region region,
                                        Collection genes) {
        this.rsId = rsId;
        this.chromosomeName = chromosomeName;
        this.chromosomePosition = chromosomePosition;
        this.lastUpdateDate = lastUpdateDate;
File
SingleNucleotidePolymorphism.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
        return id;
    }

<<<<<<< HEAD
    public String getRsId() {
        return rsId;
=======
    public void setId(Long id) {
        this.id = id;
    }

    public String getRsID() {
        return rsID;
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
    }

    public void setRsID(String rsID) {
Solution content 
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getRsId() {
        return rsId;
    }
File
SingleNucleotidePolymorphism.java
Developer's decision
Combination
Kind of conflict
Attribute
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
                ", lastUpdateDate=" + lastUpdateDate +
                '}';
    }
<<<<<<< HEAD


=======
>>>>>>> 31ead9ccaf9373aeccc600742816f13ec6ef664f
}
Solution content 
                ", lastUpdateDate=" + lastUpdateDate +
                ", region=" + region +
                ", genes=" + genes +
                '}';
    }
}
File
SingleNucleotidePolymorphism.java
Developer's decision
Manual
Kind of conflict
Blank