#4966

Committed 10 Apr 2024 06:11PM UTC coverage: 75.845% (+0.3%) from 75.552%

Build # #4966

Build Type

push

Committed by

Commit Message

[DUOS-2932][risk=no] Use V4 algorithm for all matches (#2286)

Run Details

58 of 78 new or added lines in 7 files covered. (74.36%)

14 existing lines in 3 files now uncovered.

9464 of 12478 relevant lines covered (75.85%)

0.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.81

/src/main/java/org/broadinstitute/consent/http/models/DataUse.java

package org.broadinstitute.consent.http.models;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.google.gson.GsonBuilder;
import java.util.List;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class DataUse {

  private Boolean generalUse;
  private Boolean hmbResearch;
  private List<String> diseaseRestrictions;
  private Boolean populationOriginsAncestry;
  private Boolean methodsResearch;
  private Boolean nonProfitUse;
  private String other;
  private String secondaryOther;
  // Also known as "irb"
  private Boolean ethicsApprovalRequired;
  private Boolean collaboratorRequired;
  private String geographicalRestrictions;
  private Boolean geneticStudiesOnly;
  private Boolean publicationResults;
  private String publicationMoratorium;
  private Boolean controls;
  private String gender;
  private Boolean pediatric;
  private Boolean population;
  private Boolean illegalBehavior;
  private Boolean sexualDiseases;
  private Boolean stigmatizeDiseases;
  private Boolean vulnerablePopulations;
  private Boolean psychologicalTraits;
  private Boolean notHealth;

  @Override
  public String toString() {
    return new GsonBuilder().create().toJson(this);
  }

  public Boolean getGeneralUse() {
    return generalUse;
  }

  public void setGeneralUse(Boolean generalUse) {
    this.generalUse = generalUse;
  }

  public Boolean getHmbResearch() {
    return hmbResearch;
  }

  public void setHmbResearch(Boolean hmbResearch) {
    this.hmbResearch = hmbResearch;
  }

  public List<String> getDiseaseRestrictions() {
    return diseaseRestrictions;
  }

  public void setDiseaseRestrictions(List<String> diseaseRestrictions) {
    this.diseaseRestrictions = diseaseRestrictions;
  }

  public Boolean getPopulationOriginsAncestry() {
    return populationOriginsAncestry;
  }

  public void setPopulationOriginsAncestry(Boolean populationOriginsAncestry) {
    this.populationOriginsAncestry = populationOriginsAncestry;
  }

  public Boolean getMethodsResearch() {
    return methodsResearch;
  }

  public void setMethodsResearch(Boolean methodsResearch) {
    this.methodsResearch = methodsResearch;
  }

  public Boolean getNonProfitUse() {
    return nonProfitUse;
  }

  public void setNonProfitUse(Boolean nonProfitUse) {
    this.nonProfitUse = nonProfitUse;
  }

  public String getOther() {
    return other;
  }

  public void setOther(String other) {
    this.other = other;
  }

  public String getSecondaryOther() {
    return secondaryOther;
  }

  public void setSecondaryOther(String secondaryOther) {
    this.secondaryOther = secondaryOther;
  }

  public Boolean getEthicsApprovalRequired() {
    return ethicsApprovalRequired;
  }

  public void setEthicsApprovalRequired(Boolean ethicsApprovalRequired) {
    this.ethicsApprovalRequired = ethicsApprovalRequired;
  }

  public Boolean getCollaboratorRequired() {
    return collaboratorRequired;
  }

  public void setCollaboratorRequired(Boolean collaboratorRequired) {
    this.collaboratorRequired = collaboratorRequired;
  }

  public String getGeographicalRestrictions() {
    return geographicalRestrictions;
  }

  public void setGeographicalRestrictions(String geographicalRestrictions) {
    this.geographicalRestrictions = geographicalRestrictions;
  }

  public Boolean getGeneticStudiesOnly() {
    return geneticStudiesOnly;
  }

  public void setGeneticStudiesOnly(Boolean geneticStudiesOnly) {
    this.geneticStudiesOnly = geneticStudiesOnly;
  }

  public Boolean getPublicationResults() {
    return publicationResults;
  }

  public void setPublicationResults(Boolean publicationResults) {
    this.publicationResults = publicationResults;
  }

  public String getPublicationMoratorium() {
    return publicationMoratorium;
  }

  public void setPublicationMoratorium(String publicationMoratorium) {
    this.publicationMoratorium = publicationMoratorium;
  }

  public Boolean getControls() {
    return controls;
  }

  public void setControls(Boolean controls) {
    this.controls = controls;
  }

  public String getGender() {
    return gender;
  }

  public void setGender(String gender) {
    this.gender = gender;
  }

  public Boolean getPediatric() {
    return pediatric;
  }

  public void setPediatric(Boolean pediatric) {
    this.pediatric = pediatric;
  }

  public Boolean getPopulation() {
    return population;
  }

  public void setPopulation(Boolean population) {
    this.population = population;
  }

  public Boolean getIllegalBehavior() {
    return illegalBehavior;
  }

  public void setIllegalBehavior(Boolean illegalBehavior) {
    this.illegalBehavior = illegalBehavior;
  }

  public Boolean getSexualDiseases() {
    return sexualDiseases;
  }

  public void setSexualDiseases(Boolean sexualDiseases) {
    this.sexualDiseases = sexualDiseases;
  }

  public Boolean getStigmatizeDiseases() {
    return stigmatizeDiseases;
  }

  public void setStigmatizeDiseases(Boolean stigmatizeDiseases) {
    this.stigmatizeDiseases = stigmatizeDiseases;
  }

  public Boolean getVulnerablePopulations() {
    return vulnerablePopulations;
  }

  public void setVulnerablePopulations(Boolean vulnerablePopulations) {
    this.vulnerablePopulations = vulnerablePopulations;
  }

  public Boolean getPsychologicalTraits() {
    return psychologicalTraits;
  }

  public void setPsychologicalTraits(Boolean psychologicalTraits) {
    this.psychologicalTraits = psychologicalTraits;
  }

  public Boolean getNotHealth() {
    return notHealth;
  }

  public void setNotHealth(Boolean notHealth) {
    this.notHealth = notHealth;
  }

  @Override
  public boolean equals(Object o) {
    if (this == o) {
      return true;
    }

    if (o == null || getClass() != o.getClass()) {
      return false;
    }

    DataUse dataUse = (DataUse) o;

    return new EqualsBuilder().append(generalUse, dataUse.generalUse)
        .append(hmbResearch, dataUse.hmbResearch)
        .append(diseaseRestrictions, dataUse.diseaseRestrictions)
        .append(populationOriginsAncestry, dataUse.populationOriginsAncestry)
        .append(methodsResearch, dataUse.methodsResearch).append(nonProfitUse, dataUse.nonProfitUse)
        .append(other, dataUse.other).append(secondaryOther, dataUse.secondaryOther)
        .append(ethicsApprovalRequired, dataUse.ethicsApprovalRequired)
        .append(collaboratorRequired, dataUse.collaboratorRequired)
        .append(geographicalRestrictions, dataUse.geographicalRestrictions)
        .append(geneticStudiesOnly, dataUse.geneticStudiesOnly)
        .append(publicationResults, dataUse.publicationResults)
        .append(publicationMoratorium, dataUse.publicationMoratorium)
        .append(controls, dataUse.controls).append(gender, dataUse.gender)
        .append(pediatric, dataUse.pediatric).append(population, dataUse.population)
        .append(illegalBehavior, dataUse.illegalBehavior)
        .append(sexualDiseases, dataUse.sexualDiseases)
        .append(stigmatizeDiseases, dataUse.stigmatizeDiseases)
        .append(vulnerablePopulations, dataUse.vulnerablePopulations)
        .append(psychologicalTraits, dataUse.psychologicalTraits)
        .append(notHealth, dataUse.notHealth)
        .isEquals();
  }

  @Override
  public int hashCode() {
    return new HashCodeBuilder(17, 37).append(generalUse).append(hmbResearch)
        .append(diseaseRestrictions).append(populationOriginsAncestry).append(methodsResearch)
        .append(nonProfitUse).append(other).append(secondaryOther).append(ethicsApprovalRequired)
        .append(collaboratorRequired).append(geographicalRestrictions).append(geneticStudiesOnly)
        .append(publicationResults).append(publicationMoratorium).append(controls).append(gender)
        .append(pediatric).append(population).append(illegalBehavior).append(sexualDiseases)
        .append(stigmatizeDiseases).append(vulnerablePopulations).append(psychologicalTraits)
        .append(notHealth).toHashCode();
  }
}

1	package org.broadinstitute.consent.http.models;
2
3	import com.fasterxml.jackson.annotation.JsonInclude;
4	import com.google.gson.GsonBuilder;
5	import java.util.List;
6	import org.apache.commons.lang3.builder.EqualsBuilder;
7	import org.apache.commons.lang3.builder.HashCodeBuilder;
8
9	@JsonInclude(JsonInclude.Include.NON_EMPTY)
10	public class DataUse {	1✔
11
12	private Boolean generalUse;
13	private Boolean hmbResearch;
14	private List<String> diseaseRestrictions;
15	private Boolean populationOriginsAncestry;
16	private Boolean methodsResearch;
17	private Boolean nonProfitUse;
18	private String other;
19	private String secondaryOther;
20	// Also known as "irb"
21	private Boolean ethicsApprovalRequired;
22	private Boolean collaboratorRequired;
23	private String geographicalRestrictions;
24	private Boolean geneticStudiesOnly;
25	private Boolean publicationResults;
26	private String publicationMoratorium;
27	private Boolean controls;
28	private String gender;
29	private Boolean pediatric;
30	private Boolean population;
31	private Boolean illegalBehavior;
32	private Boolean sexualDiseases;
33	private Boolean stigmatizeDiseases;
34	private Boolean vulnerablePopulations;
35	private Boolean psychologicalTraits;
36	private Boolean notHealth;
37
38	@Override
39	public String toString() {
40	return new GsonBuilder().create().toJson(this);	1✔
41	}
42
43	public Boolean getGeneralUse() {
44	return generalUse;	1✔
45	}
46
47	public void setGeneralUse(Boolean generalUse) {
48	this.generalUse = generalUse;	1✔
49	}	1✔
50
51	public Boolean getHmbResearch() {
52	return hmbResearch;	1✔
53	}
54
55	public void setHmbResearch(Boolean hmbResearch) {
56	this.hmbResearch = hmbResearch;	1✔
57	}	1✔
58
59	public List<String> getDiseaseRestrictions() {
60	return diseaseRestrictions;	1✔
61	}
62
63	public void setDiseaseRestrictions(List<String> diseaseRestrictions) {
64	this.diseaseRestrictions = diseaseRestrictions;	1✔
65	}	1✔
66
67	public Boolean getPopulationOriginsAncestry() {
68	return populationOriginsAncestry;	1✔
69	}
70
71	public void setPopulationOriginsAncestry(Boolean populationOriginsAncestry) {
72	this.populationOriginsAncestry = populationOriginsAncestry;	1✔
73	}	1✔
74
75	public Boolean getMethodsResearch() {
76	return methodsResearch;	1✔
77	}
78
79	public void setMethodsResearch(Boolean methodsResearch) {
80	this.methodsResearch = methodsResearch;	1✔
81	}	1✔
82
83	public Boolean getNonProfitUse() {
84	return nonProfitUse;	1✔
85	}
86
87	public void setNonProfitUse(Boolean nonProfitUse) {
88	this.nonProfitUse = nonProfitUse;	1✔
89	}	1✔
90
91	public String getOther() {
92	return other;	1✔
93	}
94
95	public void setOther(String other) {
96	this.other = other;	1✔
97	}	1✔
98
99	public String getSecondaryOther() {
100	return secondaryOther;	1✔
101	}
102
103	public void setSecondaryOther(String secondaryOther) {
104	this.secondaryOther = secondaryOther;	1✔
105	}	1✔
106
107	public Boolean getEthicsApprovalRequired() {
108	return ethicsApprovalRequired;	1✔
109	}
110
111	public void setEthicsApprovalRequired(Boolean ethicsApprovalRequired) {
112	this.ethicsApprovalRequired = ethicsApprovalRequired;	1✔
113	}	1✔
114
115	public Boolean getCollaboratorRequired() {
116	return collaboratorRequired;	1✔
117	}
118
119	public void setCollaboratorRequired(Boolean collaboratorRequired) {
120	this.collaboratorRequired = collaboratorRequired;	1✔
121	}	1✔
122
123	public String getGeographicalRestrictions() {
124	return geographicalRestrictions;	1✔
125	}
126
127	public void setGeographicalRestrictions(String geographicalRestrictions) {
128	this.geographicalRestrictions = geographicalRestrictions;	1✔
129	}	1✔
130
131	public Boolean getGeneticStudiesOnly() {
132	return geneticStudiesOnly;	1✔
133	}
134
135	public void setGeneticStudiesOnly(Boolean geneticStudiesOnly) {
136	this.geneticStudiesOnly = geneticStudiesOnly;	1✔
137	}	1✔
138
139	public Boolean getPublicationResults() {
140	return publicationResults;	1✔
141	}
142
143	public void setPublicationResults(Boolean publicationResults) {
144	this.publicationResults = publicationResults;	1✔
145	}	1✔
146
147	public String getPublicationMoratorium() {
148	return publicationMoratorium;	1✔
149	}
150
151	public void setPublicationMoratorium(String publicationMoratorium) {
152	this.publicationMoratorium = publicationMoratorium;	1✔
153	}	1✔
154
155	public Boolean getControls() {
156	return controls;	1✔
157	}
158
159	public void setControls(Boolean controls) {
160	this.controls = controls;	1✔
161	}	1✔
162
163	public String getGender() {
164	return gender;	1✔
165	}
166
167	public void setGender(String gender) {
168	this.gender = gender;	1✔
169	}	1✔
170
171	public Boolean getPediatric() {
172	return pediatric;	1✔
173	}
174
175	public void setPediatric(Boolean pediatric) {
176	this.pediatric = pediatric;	1✔
177	}	1✔
178
179	public Boolean getPopulation() {
180	return population;	1✔
181	}
182
183	public void setPopulation(Boolean population) {
NEW 184	this.population = population;	×
UNCOV 185	}	×
186
187	public Boolean getIllegalBehavior() {
188	return illegalBehavior;	1✔
189	}
190
191	public void setIllegalBehavior(Boolean illegalBehavior) {
192	this.illegalBehavior = illegalBehavior;	1✔
193	}	1✔
194
195	public Boolean getSexualDiseases() {
196	return sexualDiseases;	1✔
197	}
198
199	public void setSexualDiseases(Boolean sexualDiseases) {
200	this.sexualDiseases = sexualDiseases;	1✔
201	}	1✔
202
203	public Boolean getStigmatizeDiseases() {
204	return stigmatizeDiseases;	1✔
205	}
206
207	public void setStigmatizeDiseases(Boolean stigmatizeDiseases) {
208	this.stigmatizeDiseases = stigmatizeDiseases;	1✔
209	}	1✔
210
211	public Boolean getVulnerablePopulations() {
212	return vulnerablePopulations;	1✔
213	}
214
215	public void setVulnerablePopulations(Boolean vulnerablePopulations) {
216	this.vulnerablePopulations = vulnerablePopulations;	1✔
217	}	1✔
218
219	public Boolean getPsychologicalTraits() {
220	return psychologicalTraits;	1✔
221	}
222
223	public void setPsychologicalTraits(Boolean psychologicalTraits) {
224	this.psychologicalTraits = psychologicalTraits;	1✔
225	}	1✔
226
227	public Boolean getNotHealth() {
228	return notHealth;	1✔
229	}
230
231	public void setNotHealth(Boolean notHealth) {
232	this.notHealth = notHealth;	1✔
233	}	1✔
234
235	@Override
236	public boolean equals(Object o) {
237	if (this == o) {	1✔
238	return true;	×
239	}
240
241	if (o == null \|\| getClass() != o.getClass()) {	1✔
242	return false;	1✔
243	}
244
245	DataUse dataUse = (DataUse) o;	1✔
246
247	return new EqualsBuilder().append(generalUse, dataUse.generalUse)	1✔
248	.append(hmbResearch, dataUse.hmbResearch)	1✔
249	.append(diseaseRestrictions, dataUse.diseaseRestrictions)	1✔
250	.append(populationOriginsAncestry, dataUse.populationOriginsAncestry)	1✔
251	.append(methodsResearch, dataUse.methodsResearch).append(nonProfitUse, dataUse.nonProfitUse)	1✔
252	.append(other, dataUse.other).append(secondaryOther, dataUse.secondaryOther)	1✔
253	.append(ethicsApprovalRequired, dataUse.ethicsApprovalRequired)	1✔
254	.append(collaboratorRequired, dataUse.collaboratorRequired)	1✔
255	.append(geographicalRestrictions, dataUse.geographicalRestrictions)	1✔
256	.append(geneticStudiesOnly, dataUse.geneticStudiesOnly)	1✔
257	.append(publicationResults, dataUse.publicationResults)	1✔
258	.append(publicationMoratorium, dataUse.publicationMoratorium)	1✔
259	.append(controls, dataUse.controls).append(gender, dataUse.gender)	1✔
260	.append(pediatric, dataUse.pediatric).append(population, dataUse.population)	1✔
261	.append(illegalBehavior, dataUse.illegalBehavior)	1✔
262	.append(sexualDiseases, dataUse.sexualDiseases)	1✔
263	.append(stigmatizeDiseases, dataUse.stigmatizeDiseases)	1✔
264	.append(vulnerablePopulations, dataUse.vulnerablePopulations)	1✔
265	.append(psychologicalTraits, dataUse.psychologicalTraits)	1✔
266	.append(notHealth, dataUse.notHealth)	1✔
267	.isEquals();	1✔
268	}
269
270	@Override
271	public int hashCode() {
NEW 272	return new HashCodeBuilder(17, 37).append(generalUse).append(hmbResearch)	×
NEW 273	.append(diseaseRestrictions).append(populationOriginsAncestry).append(methodsResearch)	×
NEW 274	.append(nonProfitUse).append(other).append(secondaryOther).append(ethicsApprovalRequired)	×
NEW 275	.append(collaboratorRequired).append(geographicalRestrictions).append(geneticStudiesOnly)	×
NEW 276	.append(publicationResults).append(publicationMoratorium).append(controls).append(gender)	×
NEW 277	.append(pediatric).append(population).append(illegalBehavior).append(sexualDiseases)	×
NEW 278	.append(stigmatizeDiseases).append(vulnerablePopulations).append(psychologicalTraits)	×
NEW 279	.append(notHealth).toHashCode();	×
280	}
281	}

DataBiosphere / consent / #4966

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous