Search in sources :

Example 21 with Employment

use of org.orcid.jaxb.model.record_rc2.Employment in project ORCID-Source by ORCID.

the class ActivityValidatorTest method getEmployment.

public Employment getEmployment() {
    Employment employment = new Employment();
    employment.setDepartmentName("department name");
    employment.setEndDate(getFuzzyDate());
    employment.setOrganization(getOrganization());
    employment.setRoleTitle("role");
    employment.setStartDate(getFuzzyDate());
    employment.setVisibility(Visibility.PUBLIC);
    return employment;
}
Also used : Employment(org.orcid.jaxb.model.record_v2.Employment)

Example 22 with Employment

use of org.orcid.jaxb.model.record_rc2.Employment in project ORCID-Source by ORCID.

the class MemberV2Test method testViewActivitiesSummaries.

@Test
public void testViewActivitiesSummaries() throws JSONException, InterruptedException, URISyntaxException {
    long time = System.currentTimeMillis();
    String accessTokenForClient1 = getAccessToken();
    String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
    Education education = (Education) unmarshallFromPath("/record_2.0_rc1/samples/education-2.0_rc1.xml", Education.class);
    education.setPutCode(null);
    education.setVisibility(Visibility.PUBLIC);
    Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc1/samples/employment-2.0_rc1.xml", Employment.class);
    employment.setPutCode(null);
    employment.setVisibility(Visibility.PUBLIC);
    Funding funding = (Funding) unmarshallFromPath("/record_2.0_rc1/samples/funding-2.0_rc1.xml", Funding.class);
    funding.setPutCode(null);
    funding.setVisibility(Visibility.PUBLIC);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    FundingExternalIdentifier fExtId = new FundingExternalIdentifier();
    fExtId.setType(FundingExternalIdentifierType.GRANT_NUMBER);
    fExtId.setValue("Funding Id " + time);
    fExtId.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId);
    Work work = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
    work.setPutCode(null);
    work.setVisibility(Visibility.PUBLIC);
    work.getExternalIdentifiers().getExternalIdentifier().clear();
    WorkExternalIdentifier wExtId = new WorkExternalIdentifier();
    wExtId.setWorkExternalIdentifierId(new WorkExternalIdentifierId("Work Id " + time));
    wExtId.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
    wExtId.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getWorkExternalIdentifier().add(wExtId);
    PeerReview peerReview = (PeerReview) unmarshallFromPath("/record_2.0_rc1/samples/peer-review-2.0_rc1.xml", PeerReview.class);
    peerReview.setPutCode(null);
    peerReview.setVisibility(Visibility.PUBLIC);
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    WorkExternalIdentifier pExtId = new WorkExternalIdentifier();
    pExtId.setWorkExternalIdentifierId(new WorkExternalIdentifierId("Work Id " + time));
    pExtId.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
    pExtId.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId);
    ClientResponse postResponse = memberV2ApiClient.createEducationXml(this.getUser1OrcidId(), education, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    postResponse = memberV2ApiClient.createEmploymentXml(this.getUser1OrcidId(), employment, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 fundings 1 and 2 get grouped together 3 in another group
         * because it have different ext ids
         * **/
    // Add 1, the default funding
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 2");
    FundingExternalIdentifier fExtId3 = new FundingExternalIdentifier();
    fExtId3.setType(FundingExternalIdentifierType.GRANT_NUMBER);
    fExtId3.setValue("extId3Value" + time);
    fExtId3.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId3);
    funding.setVisibility(Visibility.PUBLIC);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 3");
    FundingExternalIdentifier fExtId4 = new FundingExternalIdentifier();
    fExtId4.setType(FundingExternalIdentifierType.GRANT_NUMBER);
    fExtId4.setValue("extId4Value" + time);
    fExtId4.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId4);
    funding.setVisibility(Visibility.PUBLIC);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 works 1 and 2 get grouped together 3 in another group because
         * it have different ext ids 
         **/
    // Add 1, the default work
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 2");
    WorkExternalIdentifier wExtId2 = new WorkExternalIdentifier();
    wExtId2.setWorkExternalIdentifierType(WorkExternalIdentifierType.DOI);
    wExtId2.setWorkExternalIdentifierId(new WorkExternalIdentifierId("doi-ext-id" + time));
    wExtId2.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 3");
    WorkExternalIdentifier wExtId3 = new WorkExternalIdentifier();
    wExtId3.setWorkExternalIdentifierType(WorkExternalIdentifierType.EID);
    wExtId3.setWorkExternalIdentifierId(new WorkExternalIdentifierId("eid-ext-id" + time));
    wExtId3.setRelationship(Relationship.SELF);
    work.getWorkExternalIdentifiers().getExternalIdentifier().clear();
    work.getWorkExternalIdentifiers().getExternalIdentifier().add(wExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 4 peer reviews 1 and 2 get grouped together 3 in another group because
         * it have different group id 4 in another group because it doesnt have
         * any group id
         **/
    // Add 1, the default peer review
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 2");
    peerReview.getCompletionDate().setDay(new Day(2));
    peerReview.getCompletionDate().setMonth(new Month(2));
    peerReview.getCompletionDate().setYear(new Year(2016));
    peerReview.setUrl(new Url("http://peer_review/2"));
    WorkExternalIdentifier pExtId2 = new WorkExternalIdentifier();
    pExtId2.setWorkExternalIdentifierType(WorkExternalIdentifierType.DOI);
    pExtId2.setWorkExternalIdentifierId(new WorkExternalIdentifierId("doi-ext-id" + System.currentTimeMillis()));
    pExtId2.setRelationship(Relationship.SELF);
    for (WorkExternalIdentifier wei : peerReview.getExternalIdentifiers().getExternalIdentifier()) {
        WorkExternalIdentifierId id = wei.getWorkExternalIdentifierId();
        id.setContent(id.getContent() + System.currentTimeMillis());
        wei.setWorkExternalIdentifierId(id);
    }
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(1).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 3");
    peerReview.getCompletionDate().setDay(new Day(3));
    peerReview.getCompletionDate().setMonth(new Month(3));
    peerReview.getCompletionDate().setYear(new Year(2017));
    peerReview.setUrl(new Url("http://peer_review/3"));
    WorkExternalIdentifier pExtId3 = new WorkExternalIdentifier();
    pExtId3.setWorkExternalIdentifierType(WorkExternalIdentifierType.EID);
    pExtId3.setWorkExternalIdentifierId(new WorkExternalIdentifierId("eid-ext-id" + System.currentTimeMillis()));
    pExtId3.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 4");
    peerReview.getCompletionDate().setDay(new Day(4));
    peerReview.getCompletionDate().setMonth(new Month(4));
    peerReview.getCompletionDate().setYear(new Year(2018));
    peerReview.setUrl(new Url("http://peer_review/4"));
    WorkExternalIdentifier pExtId4 = new WorkExternalIdentifier();
    pExtId4.setWorkExternalIdentifierType(WorkExternalIdentifierType.EID);
    pExtId4.setWorkExternalIdentifierId(new WorkExternalIdentifierId("eid-ext-id" + System.currentTimeMillis()));
    pExtId4.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId4);
    // Add 4, without ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Now, get the summaries and verify the following: - Education summary
         * is complete - Employment summary is complete - There are 3 groups of
         * fundings -- One group with 2 fundings -- One group with one funding
         * with ext ids -- One group with one funding without ext ids
         * 
         * - There are 3 groups of works -- One group with 2 works -- One group
         * with one work with ext ids -- One group with one work without ext ids
         * 
         * peer review -- There are 3 groups of peer reviews -- One group with 2 
         * peer reviews -- One groups with one peer review and ext ids -- One 
         * group with one peer review but without ext ids 
         **/
    ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
    assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
    ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
    assertNotNull(activities);
    assertFalse(activities.getEducations().getSummaries().isEmpty());
    boolean found = false;
    Long educationPutCode = null;
    for (EducationSummary summary : activities.getEducations().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("education:role-title")) {
            assertEquals("education:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            educationPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Education not found", found);
    assertFalse(activities.getEmployments().getSummaries().isEmpty());
    found = false;
    Long employmentPutCode = null;
    for (EmploymentSummary summary : activities.getEmployments().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("affiliation:role-title")) {
            assertEquals("affiliation:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            employmentPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Employment not found", found);
    assertNotNull(activities.getFundings());
    boolean found1 = false, found2 = false, found3 = false, found4 = false;
    List<Long> fundingPutCodes = new ArrayList<Long>();
    for (FundingGroup group : activities.getFundings().getFundingGroup()) {
        for (FundingSummary summary : group.getFundingSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("common:title")) {
                found1 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 2")) {
                found2 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 3")) {
                found3 = true;
                fundingPutCodes.add(summary.getPutCode());
            }
        }
    }
    assertTrue("One of the fundings was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getWorks());
    found1 = found2 = found3 = false;
    List<Long> worksPutCodes = new ArrayList<Long>();
    for (WorkGroup group : activities.getWorks().getWorkGroup()) {
        for (WorkSummary summary : group.getWorkSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("Current treatment of left main coronary artery disease")) {
                found1 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 2")) {
                found2 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 3")) {
                found3 = true;
                worksPutCodes.add(summary.getPutCode());
            }
        }
    }
    assertTrue("One of the works was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getPeerReviews());
    found1 = found2 = found3 = found4 = false;
    List<Long> peerReviewPutCodes = new ArrayList<Long>();
    for (PeerReviewGroup group : activities.getPeerReviews().getPeerReviewGroup()) {
        for (PeerReviewSummary summary : group.getPeerReviewSummary()) {
            if (summary.getCompletionDate() != null && summary.getCompletionDate().getYear() != null) {
                if (summary.getCompletionDate().getYear().getValue().equals("1848")) {
                    found1 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2016")) {
                    found2 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2017")) {
                    found3 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2018")) {
                    found4 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                }
            }
        }
    }
    assertTrue("One of the peer reviews was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ") 4(" + found4 + ")", found1 == found2 == found3 == found4 == true);
    //Delete all created elements
    ClientResponse deleteResponse = memberV2ApiClient.deleteEmploymentXml(this.getUser1OrcidId(), employmentPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    deleteResponse = memberV2ApiClient.deleteEducationXml(this.getUser1OrcidId(), educationPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    for (Long putCode : fundingPutCodes) {
        deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete funding " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : worksPutCodes) {
        deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete work " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : peerReviewPutCodes) {
        deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete peer review " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Funding(org.orcid.jaxb.model.record_rc1.Funding) ArrayList(java.util.ArrayList) FundingExternalIdentifier(org.orcid.jaxb.model.record_rc1.FundingExternalIdentifier) Url(org.orcid.jaxb.model.common_rc1.Url) ActivitiesSummary(org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary) Month(org.orcid.jaxb.model.common_rc1.Month) WorkGroup(org.orcid.jaxb.model.record.summary_rc1.WorkGroup) WorkSummary(org.orcid.jaxb.model.record.summary_rc1.WorkSummary) Education(org.orcid.jaxb.model.record_rc1.Education) Employment(org.orcid.jaxb.model.record_rc1.Employment) Work(org.orcid.jaxb.model.record_rc1.Work) FundingSummary(org.orcid.jaxb.model.record.summary_rc1.FundingSummary) PeerReviewGroup(org.orcid.jaxb.model.record.summary_rc1.PeerReviewGroup) WorkExternalIdentifierId(org.orcid.jaxb.model.record_rc1.WorkExternalIdentifierId) FundingGroup(org.orcid.jaxb.model.record.summary_rc1.FundingGroup) Year(org.orcid.jaxb.model.common_rc1.Year) EducationSummary(org.orcid.jaxb.model.record.summary_rc1.EducationSummary) PeerReviewSummary(org.orcid.jaxb.model.record.summary_rc1.PeerReviewSummary) EmploymentSummary(org.orcid.jaxb.model.record.summary_rc1.EmploymentSummary) WorkExternalIdentifier(org.orcid.jaxb.model.record_rc1.WorkExternalIdentifier) Day(org.orcid.jaxb.model.common_rc1.Day) PeerReview(org.orcid.jaxb.model.record_rc1.PeerReview) Test(org.junit.Test)

Example 23 with Employment

use of org.orcid.jaxb.model.record_rc2.Employment in project ORCID-Source by ORCID.

the class BlackBoxBaseRC2 method unmarshallFromPath.

public Object unmarshallFromPath(String path, Class<?> type) {
    try (Reader reader = new InputStreamReader(getClass().getResourceAsStream(path))) {
        Object obj = unmarshall(reader, type);
        Object result = null;
        if (Address.class.equals(type)) {
            result = (Address) obj;
        } else if (Education.class.equals(type)) {
            result = (Education) obj;
        } else if (Employment.class.equals(type)) {
            result = (Employment) obj;
        } else if (Funding.class.equals(type)) {
            result = (Funding) obj;
        } else if (Keyword.class.equals(type)) {
            result = (Keyword) obj;
        } else if (Work.class.equals(type)) {
            result = (Work) obj;
        } else if (PeerReview.class.equals(type)) {
            result = (PeerReview) obj;
        } else if (ResearcherUrl.class.equals(type)) {
            result = (ResearcherUrl) obj;
        } else if (PersonalDetails.class.equals(type)) {
            result = (PersonalDetails) obj;
        } else if (OtherName.class.equals(type)) {
            result = (OtherName) obj;
        } else if (PersonExternalIdentifier.class.equals(type)) {
            result = (PersonExternalIdentifier) obj;
        }
        return result;
    } catch (IOException e) {
        throw new RuntimeException("Error reading notification from classpath", e);
    }
}
Also used : InputStreamReader(java.io.InputStreamReader) Education(org.orcid.jaxb.model.record_rc2.Education) Funding(org.orcid.jaxb.model.record_rc2.Funding) Work(org.orcid.jaxb.model.record_rc2.Work) OtherName(org.orcid.jaxb.model.record_rc2.OtherName) Reader(java.io.Reader) InputStreamReader(java.io.InputStreamReader) ResearcherUrl(org.orcid.jaxb.model.record_rc2.ResearcherUrl) IOException(java.io.IOException)

Example 24 with Employment

use of org.orcid.jaxb.model.record_rc2.Employment in project ORCID-Source by ORCID.

the class MemberV2Test method testViewActivitiesSummaries.

@Test
public void testViewActivitiesSummaries() throws JSONException, InterruptedException, URISyntaxException {
    long time = System.currentTimeMillis();
    String accessTokenForClient1 = getAccessToken();
    String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
    Education education = (Education) unmarshallFromPath("/record_2.0_rc2/samples/education-2.0_rc2.xml", Education.class);
    education.setPutCode(null);
    education.setVisibility(Visibility.PUBLIC);
    Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc2/samples/employment-2.0_rc2.xml", Employment.class);
    employment.setPutCode(null);
    employment.setVisibility(Visibility.PUBLIC);
    Funding funding = (Funding) unmarshallFromPath("/record_2.0_rc2/samples/funding-2.0_rc2.xml", Funding.class);
    funding.setPutCode(null);
    funding.setVisibility(Visibility.PUBLIC);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID fExtId = new ExternalID();
    fExtId.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId.setValue("Funding Id " + time);
    fExtId.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId);
    Work work = (Work) unmarshallFromPath("/record_2.0_rc2/samples/work-2.0_rc2.xml", Work.class);
    work.setPutCode(null);
    work.setVisibility(Visibility.PUBLIC);
    work.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID wExtId = new ExternalID();
    wExtId.setValue("Work Id " + time);
    wExtId.setType(WorkExternalIdentifierType.AGR.value());
    wExtId.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getExternalIdentifier().add(wExtId);
    PeerReview peerReview = (PeerReview) unmarshallFromPath("/record_2.0_rc2/samples/peer-review-2.0_rc2.xml", PeerReview.class);
    peerReview.setPutCode(null);
    peerReview.setVisibility(Visibility.PUBLIC);
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID pExtId = new ExternalID();
    pExtId.setValue("Work Id " + time);
    pExtId.setType(WorkExternalIdentifierType.AGR.value());
    pExtId.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId);
    ClientResponse postResponse = memberV2ApiClient.createEducationXml(this.getUser1OrcidId(), education, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    postResponse = memberV2ApiClient.createEmploymentXml(this.getUser1OrcidId(), employment, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 fundings 1 and 2 get grouped together 3 in another group
         * because it have different ext ids
         * **/
    // Add 1, the default funding
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 2");
    ExternalID fExtId3 = new ExternalID();
    fExtId3.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId3.setValue("extId3Value" + time);
    fExtId3.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId3);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 3");
    ExternalID fExtId4 = new ExternalID();
    fExtId4.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId4.setValue("extId4Value" + time);
    fExtId4.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId4);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 works 1 and 2 get grouped together 3 in another group because
         * it have different ext ids 
         **/
    // Add 1, the default work
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 2");
    ExternalID wExtId2 = new ExternalID();
    wExtId2.setType(WorkExternalIdentifierType.DOI.value());
    wExtId2.setValue("doi-ext-id" + time);
    wExtId2.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 3");
    ExternalID wExtId3 = new ExternalID();
    wExtId3.setType(WorkExternalIdentifierType.EID.value());
    wExtId3.setValue("eid-ext-id" + time);
    wExtId3.setRelationship(Relationship.SELF);
    work.getWorkExternalIdentifiers().getExternalIdentifier().clear();
    work.getWorkExternalIdentifiers().getExternalIdentifier().add(wExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 4 peer reviews 1 and 2 get grouped together 3 in another group because
         * it have different group id 4 in another group because it doesnt have
         * any group id
         **/
    // Add 1, the default peer review
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 2");
    peerReview.getCompletionDate().setDay(new Day(2));
    peerReview.getCompletionDate().setMonth(new Month(2));
    peerReview.getCompletionDate().setYear(new Year(2016));
    peerReview.setUrl(new Url("http://peer_review/2"));
    ExternalID pExtId2 = new ExternalID();
    pExtId2.setType(WorkExternalIdentifierType.DOI.value());
    pExtId2.setValue("doi-ext-id" + System.currentTimeMillis());
    pExtId2.setRelationship(Relationship.SELF);
    for (ExternalID wei : peerReview.getExternalIdentifiers().getExternalIdentifier()) {
        wei.setValue(wei.getValue() + System.currentTimeMillis());
    }
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(1).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 3");
    peerReview.getCompletionDate().setDay(new Day(3));
    peerReview.getCompletionDate().setMonth(new Month(3));
    peerReview.getCompletionDate().setYear(new Year(2017));
    peerReview.setUrl(new Url("http://peer_review/3"));
    ExternalID pExtId3 = new ExternalID();
    pExtId3.setType(WorkExternalIdentifierType.EID.value());
    pExtId3.setValue("eid-ext-id" + System.currentTimeMillis());
    pExtId3.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 4");
    peerReview.getCompletionDate().setDay(new Day(4));
    peerReview.getCompletionDate().setMonth(new Month(4));
    peerReview.getCompletionDate().setYear(new Year(2018));
    peerReview.setUrl(new Url("http://peer_review/4"));
    ExternalID pExtId4 = new ExternalID();
    pExtId4.setType(WorkExternalIdentifierType.EID.value());
    pExtId4.setValue("eid-ext-id" + System.currentTimeMillis());
    pExtId4.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId4);
    // Add 4, without ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Now, get the summaries and verify the following: - Education summary
         * is complete - Employment summary is complete - There are 3 groups of
         * fundings -- One group with 2 fundings -- One group with one funding
         * with ext ids -- One group with one funding without ext ids
         * 
         * - There are 3 groups of works -- One group with 2 works -- One group
         * with one work with ext ids -- One group with one work without ext ids
         * 
         * peer review -- There are 3 groups of peer reviews -- One group with 2 
         * peer reviews -- One groups with one peer review and ext ids -- One 
         * group with one peer review but without ext ids 
         **/
    ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
    assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
    ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
    assertNotNull(activities);
    assertFalse(activities.getEducations().getSummaries().isEmpty());
    boolean found = false;
    Long educationPutCode = null;
    for (EducationSummary summary : activities.getEducations().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("education:role-title")) {
            assertEquals("education:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            educationPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Education not found", found);
    assertFalse(activities.getEmployments().getSummaries().isEmpty());
    found = false;
    Long employmentPutCode = null;
    for (EmploymentSummary summary : activities.getEmployments().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("employment:role-title")) {
            assertEquals("employment:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            employmentPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Employment not found", found);
    assertNotNull(activities.getFundings());
    boolean found1 = false, found2 = false, found3 = false, found4 = false;
    List<Long> fundingPutCodes = new ArrayList<Long>();
    for (FundingGroup group : activities.getFundings().getFundingGroup()) {
        for (FundingSummary summary : group.getFundingSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("common:title")) {
                found1 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 2")) {
                found2 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 3")) {
                found3 = true;
                fundingPutCodes.add(summary.getPutCode());
            }
        }
    }
    assertTrue("One of the fundings was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getWorks());
    found1 = found2 = found3 = false;
    List<Long> worksPutCodes = new ArrayList<Long>();
    for (WorkGroup group : activities.getWorks().getWorkGroup()) {
        for (WorkSummary summary : group.getWorkSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("common:title")) {
                found1 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 2")) {
                found2 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 3")) {
                found3 = true;
                worksPutCodes.add(summary.getPutCode());
            } else {
                fail("Couldnt find work with title: " + summary.getTitle().getTitle().getContent());
            }
        }
    }
    assertTrue("One of the works was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getPeerReviews());
    found1 = found2 = found3 = found4 = false;
    List<Long> peerReviewPutCodes = new ArrayList<Long>();
    for (PeerReviewGroup group : activities.getPeerReviews().getPeerReviewGroup()) {
        for (PeerReviewSummary summary : group.getPeerReviewSummary()) {
            if (summary.getCompletionDate() != null && summary.getCompletionDate().getYear() != null) {
                if (summary.getCompletionDate().getYear().getValue().equals("1848")) {
                    found1 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2016")) {
                    found2 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2017")) {
                    found3 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2018")) {
                    found4 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                }
            }
        }
    }
    assertTrue("One of the peer reviews was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ") 4(" + found4 + ")", found1 == found2 == found3 == found4 == true);
    //Delete all created elements
    ClientResponse deleteResponse = memberV2ApiClient.deleteEmploymentXml(this.getUser1OrcidId(), employmentPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    deleteResponse = memberV2ApiClient.deleteEducationXml(this.getUser1OrcidId(), educationPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    for (Long putCode : fundingPutCodes) {
        deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete funding " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : worksPutCodes) {
        deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete work " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : peerReviewPutCodes) {
        deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete peer review " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Funding(org.orcid.jaxb.model.record_rc2.Funding) ExternalID(org.orcid.jaxb.model.record_rc2.ExternalID) ArrayList(java.util.ArrayList) Url(org.orcid.jaxb.model.common_rc2.Url) ActivitiesSummary(org.orcid.jaxb.model.record.summary_rc2.ActivitiesSummary) Month(org.orcid.jaxb.model.common_rc2.Month) WorkGroup(org.orcid.jaxb.model.record.summary_rc2.WorkGroup) WorkSummary(org.orcid.jaxb.model.record.summary_rc2.WorkSummary) Education(org.orcid.jaxb.model.record_rc2.Education) Employment(org.orcid.jaxb.model.record_rc2.Employment) Work(org.orcid.jaxb.model.record_rc2.Work) FundingSummary(org.orcid.jaxb.model.record.summary_rc2.FundingSummary) PeerReviewGroup(org.orcid.jaxb.model.record.summary_rc2.PeerReviewGroup) FundingGroup(org.orcid.jaxb.model.record.summary_rc2.FundingGroup) Year(org.orcid.jaxb.model.common_rc2.Year) EducationSummary(org.orcid.jaxb.model.record.summary_rc2.EducationSummary) PeerReviewSummary(org.orcid.jaxb.model.record.summary_rc2.PeerReviewSummary) EmploymentSummary(org.orcid.jaxb.model.record.summary_rc2.EmploymentSummary) Day(org.orcid.jaxb.model.common_rc2.Day) PeerReview(org.orcid.jaxb.model.record_rc2.PeerReview) Test(org.junit.Test)

Example 25 with Employment

use of org.orcid.jaxb.model.record_rc2.Employment in project ORCID-Source by ORCID.

the class MemberV2Test method createViewUpdateAndDeleteEmployment.

@Test
public void createViewUpdateAndDeleteEmployment() throws JSONException, InterruptedException, URISyntaxException {
    Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc2/samples/employment-2.0_rc2.xml", Employment.class);
    employment.setPutCode(null);
    employment.setVisibility(Visibility.PUBLIC);
    String accessToken = getAccessToken();
    ClientResponse postResponse = memberV2ApiClient.createEmploymentXml(this.getUser1OrcidId(), employment, accessToken);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    String locationPath = postResponse.getLocation().getPath();
    assertTrue("Location header path should match pattern, but was " + locationPath, locationPath.matches(".*/v2.0_rc2/" + this.getUser1OrcidId() + "/employment/\\d+"));
    ClientResponse getResponse = memberV2ApiClient.viewLocationXml(postResponse.getLocation(), accessToken);
    assertEquals(Response.Status.OK.getStatusCode(), getResponse.getStatus());
    Employment gotEmployment = getResponse.getEntity(Employment.class);
    assertEquals("employment:department-name", gotEmployment.getDepartmentName());
    assertEquals("employment:role-title", gotEmployment.getRoleTitle());
    //Save the original visibility
    Visibility originalVisibility = gotEmployment.getVisibility();
    Visibility updatedVisibility = Visibility.PRIVATE.equals(originalVisibility) ? Visibility.LIMITED : Visibility.PRIVATE;
    //Verify you cant update the visibility
    gotEmployment.setVisibility(updatedVisibility);
    ClientResponse putResponse = memberV2ApiClient.updateLocationXml(postResponse.getLocation(), accessToken, gotEmployment);
    assertEquals(Response.Status.FORBIDDEN.getStatusCode(), putResponse.getStatus());
    OrcidError error = putResponse.getEntity(OrcidError.class);
    assertNotNull(error);
    assertEquals(Integer.valueOf(9035), error.getErrorCode());
    //Set the visibility again to the initial one
    gotEmployment.setVisibility(originalVisibility);
    gotEmployment.setDepartmentName("updated dept. name");
    gotEmployment.setRoleTitle("updated role title");
    putResponse = memberV2ApiClient.updateLocationXml(postResponse.getLocation(), accessToken, gotEmployment);
    assertEquals(Response.Status.OK.getStatusCode(), putResponse.getStatus());
    ClientResponse getAfterUpdateResponse = memberV2ApiClient.viewLocationXml(postResponse.getLocation(), accessToken);
    assertEquals(Response.Status.OK.getStatusCode(), getAfterUpdateResponse.getStatus());
    Employment gotAfterUpdateEmployment = getAfterUpdateResponse.getEntity(Employment.class);
    assertEquals("updated dept. name", gotAfterUpdateEmployment.getDepartmentName());
    assertEquals("updated role title", gotAfterUpdateEmployment.getRoleTitle());
    ClientResponse deleteResponse = memberV2ApiClient.deleteEmploymentXml(this.getUser1OrcidId(), gotEmployment.getPutCode(), accessToken);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) OrcidError(org.orcid.jaxb.model.error_rc1.OrcidError) Employment(org.orcid.jaxb.model.record_rc2.Employment) Visibility(org.orcid.jaxb.model.common_rc2.Visibility) Test(org.junit.Test)

Aggregations

Test (org.junit.Test)41 Employment (org.orcid.jaxb.model.record_v2.Employment)38 ClientResponse (com.sun.jersey.api.client.ClientResponse)22 Response (javax.ws.rs.core.Response)13 DBUnitTest (org.orcid.test.DBUnitTest)13 Employment (org.orcid.jaxb.model.record_rc1.Employment)8 ArrayList (java.util.ArrayList)6 Education (org.orcid.jaxb.model.record_v2.Education)6 OrcidError (org.orcid.jaxb.model.error_rc1.OrcidError)4 Funding (org.orcid.jaxb.model.record_v2.Funding)4 PeerReview (org.orcid.jaxb.model.record_v2.PeerReview)4 Work (org.orcid.jaxb.model.record_v2.Work)4 Day (org.orcid.jaxb.model.common_v2.Day)3 Month (org.orcid.jaxb.model.common_v2.Month)3 Year (org.orcid.jaxb.model.common_v2.Year)3 Address (org.orcid.jaxb.model.record_v2.Address)3 Keyword (org.orcid.jaxb.model.record_v2.Keyword)3 OtherName (org.orcid.jaxb.model.record_v2.OtherName)3 PersonExternalIdentifier (org.orcid.jaxb.model.record_v2.PersonExternalIdentifier)3 ResearcherUrl (org.orcid.jaxb.model.record_v2.ResearcherUrl)3