-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First draft education, qualification and research resources added to …
…record summary
- Loading branch information
1 parent
76920bb
commit 0b4177c
Showing
6 changed files
with
349 additions
and
1 deletion.
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
120 changes: 120 additions & 0 deletions
120
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,120 @@ | ||
| 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); | ||
| } | ||
|
|
||
| } |
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
18 changes: 18 additions & 0 deletions
18
orcid-core/src/main/java/org/orcid/core/model/ResearchResources.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,18 @@ | ||
| package org.orcid.core.model; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import javax.xml.bind.annotation.XmlRootElement; | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
|
|
||
| @XmlRootElement(name = "research-resources", namespace = "http://www.orcid.org/ns/summary") | ||
| @Schema(description = "Research resources") | ||
| public class ResearchResources extends ItemsCount implements Serializable { | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| } |
Oops, something went wrong.