From c6bb2391ce6cc38565f37736f2f1232786ac99c2 Mon Sep 17 00:00:00 2001
From: Martin Lowe <martin.lowe@eclipse-foundation.org>
Date: Wed, 4 Jun 2025 14:18:45 -0400
Subject: [PATCH 1/2] feat: Remove Gerrit URL field as it is no longer needed
---
.../org/eclipsefoundation/efservices/api/models/EfUser.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/EfUser.java b/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/EfUser.java
index e4561581..282bd697 100644
--- a/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/EfUser.java
+++ b/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/EfUser.java
@@ -28,7 +28,7 @@ import io.soabase.recordbuilder.core.RecordBuilder;
public record EfUser(String uid, String name, String picture, String mail, Eca eca, Boolean isCommitter, String firstName, String lastName,
String fullName, Map<String, PublisherAgreement> publisherAgreements, String githubHandle, String twitterHandle, String org,
Integer orgId, String jobTitle, String website, String mxid, Country country, String bio, List<String> interests,
- List<Email> mailHistory, List<String> mailAlternate, String ecaUrl, String projectsUrl, String gerritUrl, String mailinglistUrl,
+ List<Email> mailHistory, List<String> mailAlternate, String ecaUrl, String projectsUrl, String mailinglistUrl,
String mpcFavoritesUrl, @JsonIgnore Boolean isBot) {
/**
@@ -37,7 +37,7 @@ public record EfUser(String uid, String name, String picture, String mail, Eca e
public EfUser(String uid, String name, String picture, String mail, Eca eca, Boolean isCommitter, String firstName, String lastName,
String fullName, Map<String, PublisherAgreement> publisherAgreements, String githubHandle, String twitterHandle, String org,
Integer orgId, String jobTitle, String website, String mxid, Country country, String bio, List<String> interests,
- List<Email> mailHistory, List<String> mailAlternate, String ecaUrl, String projectsUrl, String gerritUrl, String mailinglistUrl,
+ List<Email> mailHistory, List<String> mailAlternate, String ecaUrl, String projectsUrl, String mailinglistUrl,
String mpcFavoritesUrl, Boolean isBot) {
this.uid = Objects.requireNonNull(uid);
this.name = Objects.requireNonNull(name);
@@ -63,7 +63,6 @@ public record EfUser(String uid, String name, String picture, String mail, Eca e
this.mailAlternate = mailAlternate;
this.ecaUrl = ecaUrl;
this.projectsUrl = projectsUrl;
- this.gerritUrl = gerritUrl;
this.mailinglistUrl = mailinglistUrl;
this.mpcFavoritesUrl = mpcFavoritesUrl;
this.isBot = isBot;
--
GitLab
From 801894161cf91e5ffee7f8156568911bd1cce0f4 Mon Sep 17 00:00:00 2001
From: Martin Lowe <martin.lowe@eclipse-foundation.org>
Date: Wed, 4 Jun 2025 14:33:11 -0400
Subject: [PATCH 2/2] feat: remove gerrit_repos from Java model on project
results
---
.../org/eclipsefoundation/efservices/api/models/Project.java | 5 ++---
.../efservices/test/api/MockProjectsAPI.java | 5 -----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/Project.java b/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/Project.java
index e72ebc18..fd340f20 100644
--- a/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/Project.java
+++ b/efservices/src/main/java/org/eclipsefoundation/efservices/api/models/Project.java
@@ -24,13 +24,13 @@ import io.soabase.recordbuilder.core.RecordBuilder;
@RecordBuilder
public record Project(int nid, String projectId, String shortProjectId, String name, String summary, String url, String websiteUrl,
List<WebsiteRepo> websiteRepo, String logo, List<String> tags, List<Repo> githubRepos, List<Repo> gitlabRepos, GithubProject github,
- GitlabProject gitlab, List<Repo> gerritRepos, List<ProjectParticipant> contributors, List<ProjectParticipant> committers,
+ GitlabProject gitlab, List<ProjectParticipant> contributors, List<ProjectParticipant> committers,
List<ProjectParticipant> projectLeads, List<Collaboration> industryCollaborations, Object specProjectWorkingGroup,
List<Release> releases, String topLevelProject) {
public Project(int nid, String projectId, String shortProjectId, String name, String summary, String url, String websiteUrl,
List<WebsiteRepo> websiteRepo, String logo, List<String> tags, List<Repo> githubRepos, List<Repo> gitlabRepos, GithubProject github,
- GitlabProject gitlab, List<Repo> gerritRepos, List<ProjectParticipant> contributors, List<ProjectParticipant> committers,
+ GitlabProject gitlab, List<ProjectParticipant> contributors, List<ProjectParticipant> committers,
List<ProjectParticipant> projectLeads, List<Collaboration> industryCollaborations, Object specProjectWorkingGroup,
List<Release> releases, String topLevelProject) {
this.nid = nid;
@@ -47,7 +47,6 @@ public record Project(int nid, String projectId, String shortProjectId, String n
this.gitlabRepos = Objects.requireNonNull(gitlabRepos);
this.github = Objects.requireNonNull(github);
this.gitlab = Objects.requireNonNull(gitlab);
- this.gerritRepos = Objects.requireNonNull(gerritRepos);
this.contributors = Objects.requireNonNull(contributors);
this.committers = Objects.requireNonNull(committers);
this.projectLeads = Objects.requireNonNull(projectLeads);
diff --git a/efservices/src/test/java/org/eclipsefoundation/efservices/test/api/MockProjectsAPI.java b/efservices/src/test/java/org/eclipsefoundation/efservices/test/api/MockProjectsAPI.java
index 9c9467cc..075dc2b1 100644
--- a/efservices/src/test/java/org/eclipsefoundation/efservices/test/api/MockProjectsAPI.java
+++ b/efservices/src/test/java/org/eclipsefoundation/efservices/test/api/MockProjectsAPI.java
@@ -57,8 +57,6 @@ public class MockProjectsAPI implements ProjectsAPI {
Repo r2 = ProjectRepoBuilder.builder().url("http://www.github.com/eclipsefdn/test").build();
Repo r3 = ProjectRepoBuilder.builder().url("http://www.github.com/eclipsefdn/prototype.git").build();
Repo r4 = ProjectRepoBuilder.builder().url("http://www.github.com/eclipsefdn/tck-proto").build();
- Repo r5 = ProjectRepoBuilder.builder().url("/gitroot/sample/gerrit.project.git").build();
- Repo r6 = ProjectRepoBuilder.builder().url("/gitroot/sample/gerrit.other-project").build();
// sample users
ProjectParticipant u1 = ProjectProjectParticipantBuilder.builder().url("").username("da_wizz").fullName("da_wizz").build();
@@ -81,7 +79,6 @@ public class MockProjectsAPI implements ProjectsAPI {
.gitlabRepos(Collections.emptyList())
.gitlab(GitlabProjectBuilder.builder().ignoredSubGroups(Collections.emptyList()).projectGroup("").build())
.github(ProjectGithubProjectBuilder.builder().org("org name").ignoredRepos(Collections.emptyList()).build())
- .gerritRepos(Arrays.asList(r5))
.contributors(Collections.emptyList())
.committers(Arrays.asList(u1, u2))
.projectLeads(Collections.emptyList())
@@ -100,7 +97,6 @@ public class MockProjectsAPI implements ProjectsAPI {
.specProjectWorkingGroup(Collections.emptyMap())
.githubRepos(Arrays.asList(r3))
.gitlabRepos(Collections.emptyList())
- .gerritRepos(Arrays.asList(r6))
.committers(Arrays.asList(u2))
.projectLeads(Collections.emptyList())
.gitlab(GitlabProjectBuilder.builder().ignoredSubGroups(Collections.emptyList()).projectGroup("eclipse/dash-second").build())
@@ -127,7 +123,6 @@ public class MockProjectsAPI implements ProjectsAPI {
.specProjectWorkingGroup(Map.of("id", "proj1", "name", "proj1"))
.githubRepos(Arrays.asList(r4))
.gitlabRepos(Collections.emptyList())
- .gerritRepos(Collections.emptyList())
.gitlab(
GitlabProjectBuilder.builder().ignoredSubGroups(Arrays.asList("eclipse/dash/mirror")).projectGroup("eclipse/dash").build())
.committers(Arrays.asList(u1, u2))
--
GitLab