-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 9357-unexpected-name-data-in-the-org-typeahead
- Loading branch information
Showing
15 changed files
with
807 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
285 changes: 220 additions & 65 deletions
285
orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
orcid-core/src/main/java/org/orcid/core/model/EducationQualification.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
package org.orcid.core.model; | ||
|
||
import java.util.Objects; | ||
|
||
import javax.xml.bind.annotation.XmlAccessType; | ||
import javax.xml.bind.annotation.XmlAccessorType; | ||
import javax.xml.bind.annotation.XmlElement; | ||
import javax.xml.bind.annotation.XmlRootElement; | ||
import javax.xml.bind.annotation.XmlType; | ||
|
||
import org.orcid.jaxb.model.v3.release.common.FuzzyDate; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
|
||
@XmlAccessorType(XmlAccessType.FIELD) | ||
@XmlType(propOrder = { "putCode", "type", "organizationName", "role", "url", "startDate", "endDate", "validated" }) | ||
@XmlRootElement(name = "education-qualification", namespace = "http://www.orcid.org/ns/summary") | ||
@Schema(description = "Education Qualification") | ||
public class EducationQualification { | ||
@XmlElement(name = "put-code", namespace = "http://www.orcid.org/ns/summary") | ||
protected Long putCode; | ||
@XmlElement(name = "start-date", namespace = "http://www.orcid.org/ns/common") | ||
protected FuzzyDate startDate; | ||
@XmlElement(name = "end-date", namespace = "http://www.orcid.org/ns/common") | ||
protected FuzzyDate endDate; | ||
@XmlElement(name = "type", namespace = "http://www.orcid.org/ns/summary") | ||
protected String type; | ||
@XmlElement(name = "organization-name", namespace = "http://www.orcid.org/ns/summary") | ||
protected String organizationName; | ||
@XmlElement(name = "role", namespace = "http://www.orcid.org/ns/summary") | ||
protected String role; | ||
@XmlElement(name = "url", namespace = "http://www.orcid.org/ns/summary") | ||
protected String url; | ||
@XmlElement(name = "validated", namespace = "http://www.orcid.org/ns/summary") | ||
protected boolean validated; | ||
|
||
public Long getPutCode() { | ||
return putCode; | ||
} | ||
|
||
public void setPutCode(Long putCode) { | ||
this.putCode = putCode; | ||
} | ||
|
||
public FuzzyDate getStartDate() { | ||
return startDate; | ||
} | ||
|
||
public void setStartDate(FuzzyDate startDate) { | ||
this.startDate = startDate; | ||
} | ||
|
||
public FuzzyDate getEndDate() { | ||
return endDate; | ||
} | ||
|
||
public void setEndDate(FuzzyDate endDate) { | ||
this.endDate = endDate; | ||
} | ||
|
||
public String getType() { | ||
return type; | ||
} | ||
|
||
public void setType(String type) { | ||
this.type = type; | ||
} | ||
|
||
public String getOrganizationName() { | ||
return organizationName; | ||
} | ||
|
||
public void setOrganizationName(String organizationName) { | ||
this.organizationName = organizationName; | ||
} | ||
|
||
public String getRole() { | ||
return role; | ||
} | ||
|
||
public void setRole(String role) { | ||
this.role = role; | ||
} | ||
|
||
public String getUrl() { | ||
return url; | ||
} | ||
|
||
public void setUrl(String url) { | ||
this.url = url; | ||
} | ||
|
||
public boolean isValidated() { | ||
return validated; | ||
} | ||
|
||
public void setValidated(boolean validated) { | ||
this.validated = validated; | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(endDate, organizationName, putCode, role, startDate, type, url, validated); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (this == obj) | ||
return true; | ||
if (obj == null) | ||
return false; | ||
if (getClass() != obj.getClass()) | ||
return false; | ||
EducationQualification other = (EducationQualification) obj; | ||
return Objects.equals(endDate, other.endDate) && Objects.equals(organizationName, other.organizationName) && Objects.equals(putCode, other.putCode) | ||
&& Objects.equals(role, other.role) && Objects.equals(startDate, other.startDate) && Objects.equals(type, other.type) && Objects.equals(url, other.url) | ||
&& validated == other.validated; | ||
} | ||
} |
62 changes: 62 additions & 0 deletions
62
orcid-core/src/main/java/org/orcid/core/model/EducationQualifications.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package org.orcid.core.model; | ||
|
||
import java.io.Serializable; | ||
import java.util.List; | ||
import java.util.Objects; | ||
|
||
import javax.xml.bind.annotation.XmlAccessType; | ||
import javax.xml.bind.annotation.XmlAccessorType; | ||
import javax.xml.bind.annotation.XmlElement; | ||
import javax.xml.bind.annotation.XmlRootElement; | ||
import javax.xml.bind.annotation.XmlType; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
|
||
@XmlAccessorType(XmlAccessType.FIELD) | ||
@XmlType(propOrder = { "count", "educationQualifications" }) | ||
@XmlRootElement(name = "education-qualifications", namespace = "http://www.orcid.org/ns/summary") | ||
@Schema(description = "Education qualifications list") | ||
public class EducationQualifications implements Serializable { | ||
/** | ||
* | ||
*/ | ||
private static final long serialVersionUID = 1L; | ||
@XmlElement(name = "count", namespace = "http://www.orcid.org/ns/summary") | ||
private Integer count; | ||
@XmlElement(name = "education-qualification", namespace = "http://www.orcid.org/ns/summary") | ||
private List<EducationQualification> educationQualifications; | ||
|
||
public Integer getCount() { | ||
return count; | ||
} | ||
|
||
public void setCount(Integer count) { | ||
this.count = count; | ||
} | ||
|
||
public List<EducationQualification> getEducationQualifications() { | ||
return educationQualifications; | ||
} | ||
|
||
public void setEducationQualifications(List<EducationQualification> educationQualifications ) { | ||
this.educationQualifications = educationQualifications ; | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(count, educationQualifications); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (this == obj) | ||
return true; | ||
if (obj == null) | ||
return false; | ||
if (getClass() != obj.getClass()) | ||
return false; | ||
EducationQualifications other = (EducationQualifications) obj; | ||
return Objects.equals(count, other.count) && Objects.equals(educationQualifications, other.educationQualifications); | ||
} | ||
|
||
} |
68 changes: 68 additions & 0 deletions
68
orcid-core/src/main/java/org/orcid/core/model/EmailDomain.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package org.orcid.core.model; | ||
|
||
import java.util.Objects; | ||
|
||
import javax.xml.bind.annotation.XmlAccessType; | ||
import javax.xml.bind.annotation.XmlAccessorType; | ||
import javax.xml.bind.annotation.XmlElement; | ||
import javax.xml.bind.annotation.XmlRootElement; | ||
import javax.xml.bind.annotation.XmlType; | ||
|
||
import org.orcid.jaxb.model.v3.release.common.FuzzyDate; | ||
import org.orcid.pojo.ajaxForm.Date; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
|
||
@XmlAccessorType(XmlAccessType.FIELD) | ||
@XmlType(propOrder = { "value","createdDate", "lastModified"}) | ||
@XmlRootElement(name = "education-qualification", namespace = "http://www.orcid.org/ns/summary") | ||
@Schema(description = "Education Qualification") | ||
public class EmailDomain { | ||
@XmlElement(name = "value", namespace = "http://www.orcid.org/ns/summary") | ||
protected String value; | ||
@XmlElement(name = "created-date", namespace = "http://www.orcid.org/ns/common") | ||
protected Date createdDate; | ||
@XmlElement(name = "last-modified-date", namespace = "http://www.orcid.org/ns/common") | ||
protected Date lastModified; | ||
|
||
public String getValue() { | ||
return value; | ||
} | ||
|
||
public void setValue(String value) { | ||
this.value = value; | ||
} | ||
|
||
public Date getCreatedDate() { | ||
return createdDate; | ||
} | ||
|
||
public void setCreatedDate(Date createdDate) { | ||
this.createdDate = createdDate; | ||
} | ||
|
||
public Date getLastModified() { | ||
return lastModified; | ||
} | ||
|
||
public void setLastModified(Date lastModified) { | ||
this.lastModified = lastModified; | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(value, createdDate, lastModified); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) { | ||
if (this == obj) | ||
return true; | ||
if (obj == null) | ||
return false; | ||
if (getClass() != obj.getClass()) | ||
return false; | ||
EmailDomain other = (EmailDomain) obj; | ||
return Objects.equals(createdDate, other.createdDate) && Objects.equals(lastModified, other.lastModified) && Objects.equals(value, other.value); | ||
} | ||
} |
Oops, something went wrong.