Skip to content
Snippets Groups Projects
Commit cfb2276e authored by Zachary Sabourin's avatar Zachary Sabourin
Browse files

feat: Update EfUser model to fall in line with D9 profile changes

parent eca1beb1
No related branches found
No related tags found
1 merge request!140feat: Update EfUser model to fall in line with D9 profile changes
Pipeline #31957 passed
Stage: external
    Hide whitespace changes
    Inline Side-by-side
    efservices/src/main/java/org/eclipsefoundation/efservices/api/models/EfUser.java
    + 8
    − 6
    View file @ cfb2276e
    ......@@ -50,6 +50,8 @@ public abstract class EfUser {
    public abstract String getLastName();
    public abstract String getFullName();
    public abstract Map<String, PublisherAgreement> getPublisherAgreements();
    @Nullable
    ......@@ -57,6 +59,7 @@ public abstract class EfUser {
    public abstract String getTwitterHandle();
    @Nullable
    public abstract String getOrg();
    @Nullable
    ......@@ -73,8 +76,6 @@ public abstract class EfUser {
    public abstract List<String> getInterests();
    public abstract List<String> getWorkingGroupsInterests();
    @Nullable
    public abstract String getEcaUrl();
    ......@@ -113,14 +114,14 @@ public abstract class EfUser {
    .setPicture("")
    .setFirstName("")
    .setLastName("")
    .setFullName("")
    .setPublisherAgreements(Collections.emptyMap())
    .setTwitterHandle("")
    .setOrg("")
    .setJobTitle("bot")
    .setWebsite("")
    .setCountry(Country.builder().build())
    .setInterests(Collections.emptyList())
    .setWorkingGroupsInterests(Collections.emptyList()).build();
    .setInterests(Collections.emptyList()).build();
    }
    public static Builder builder() {
    ......@@ -147,13 +148,15 @@ public abstract class EfUser {
    public abstract Builder setLastName(String lName);
    public abstract Builder setFullName(String name);
    public abstract Builder setPublisherAgreements(Map<String, PublisherAgreement> agreements);
    public abstract Builder setGithubHandle(@Nullable String handle);
    public abstract Builder setTwitterHandle(String handle);
    public abstract Builder setOrg(String org);
    public abstract Builder setOrg(@Nullable String org);
    public abstract Builder setOrgId(@Nullable String id);
    ......@@ -167,7 +170,6 @@ public abstract class EfUser {
    public abstract Builder setInterests(List<String> interests);
    public abstract Builder setWorkingGroupsInterests(List<String> interests);
    public abstract Builder setEcaUrl(@Nullable String url);
    ......
    efservices/src/test/java/org/eclipsefoundation/efservices/test/api/MockProfileAPI.java
    + 5
    − 5
    View file @ cfb2276e
    ......@@ -61,6 +61,7 @@ public class MockProfileAPI implements ProfileAPI {
    .setPicture("pic url")
    .setFirstName("fake")
    .setLastName("user")
    .setFullName("fake user")
    .setPublisherAgreements(new HashMap<>())
    .setTwitterHandle("")
    .setOrg("null")
    ......@@ -68,7 +69,6 @@ public class MockProfileAPI implements ProfileAPI {
    .setWebsite("site url")
    .setCountry(Country.builder().setCode("CA").setName("Canada").build())
    .setInterests(Arrays.asList())
    .setWorkingGroupsInterests(Arrays.asList())
    .build(),
    EfUser.builder()
    .setUid(42)
    ......@@ -76,6 +76,7 @@ public class MockProfileAPI implements ProfileAPI {
    .setPicture("pic url")
    .setFirstName("fake")
    .setLastName("user")
    .setFullName("fake user")
    .setMail("fakeuser@test.com")
    .setPublisherAgreements(new HashMap<>())
    .setGithubHandle("fakeuser")
    ......@@ -85,7 +86,6 @@ public class MockProfileAPI implements ProfileAPI {
    .setWebsite("site url")
    .setCountry(Country.builder().setCode("CA").setName("Canada").build())
    .setInterests(Arrays.asList())
    .setWorkingGroupsInterests(Arrays.asList())
    .build(),
    EfUser.builder()
    .setUid(333)
    ......@@ -95,6 +95,7 @@ public class MockProfileAPI implements ProfileAPI {
    .setPicture("pic url")
    .setFirstName("fake")
    .setLastName("user")
    .setFullName("fake user")
    .setPublisherAgreements(new HashMap<>())
    .setTwitterHandle("")
    .setOrg("null")
    ......@@ -102,7 +103,6 @@ public class MockProfileAPI implements ProfileAPI {
    .setWebsite("site url")
    .setCountry(Country.builder().setCode("CA").setName("Canada").build())
    .setInterests(Arrays.asList())
    .setWorkingGroupsInterests(Arrays.asList())
    .build(),
    EfUser.builder()
    .setUid(11)
    ......@@ -112,6 +112,7 @@ public class MockProfileAPI implements ProfileAPI {
    .setPicture("pic url")
    .setFirstName("fake")
    .setLastName("user")
    .setFullName("fake user")
    .setPublisherAgreements(new HashMap<>())
    .setTwitterHandle("")
    .setOrg("null")
    ......@@ -119,7 +120,6 @@ public class MockProfileAPI implements ProfileAPI {
    .setWebsite("site url")
    .setCountry(Country.builder().setCode("CA").setName("Canada").build())
    .setInterests(Arrays.asList())
    .setWorkingGroupsInterests(Arrays.asList())
    .build(),
    EfUser.builder()
    .setUid(444)
    ......@@ -129,6 +129,7 @@ public class MockProfileAPI implements ProfileAPI {
    .setPicture("pic url")
    .setFirstName("fake")
    .setLastName("user")
    .setFullName("fake user")
    .setPublisherAgreements(new HashMap<>())
    .setTwitterHandle("")
    .setOrg("null")
    ......@@ -136,7 +137,6 @@ public class MockProfileAPI implements ProfileAPI {
    .setWebsite("site url")
    .setCountry(Country.builder().setCode("CA").setName("Canada").build())
    .setInterests(Arrays.asList())
    .setWorkingGroupsInterests(Arrays.asList())
    .build()));
    }
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent