From 70562ef48abba4832c0dd5494f3d9708732333df Mon Sep 17 00:00:00 2001
From: Martin Lowe <martin.lowe@eclipse-foundation.org>
Date: Thu, 9 Mar 2023 11:17:39 -0500
Subject: [PATCH] Fix error in interest group model mapping
---
.../git/eca/api/models/InterestGroupData.java | 10 +++++-----
.../eca/service/impl/DefaultInterestGroupService.java | 2 +-
.../git/eca/test/api/MockProjectsAPI.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java b/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
index bea777d5..e70f8306 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/api/models/InterestGroupData.java
@@ -16,7 +16,7 @@ public abstract class InterestGroupData {
public abstract String getTitle();
public abstract String getLogo();
public abstract String getState();
- public abstract String getFoundationdbProjectId();
+ public abstract String getProjectId();
public abstract Descriptor getDescription();
public abstract Descriptor getScope();
public abstract List<User> getLeads();
@@ -29,13 +29,13 @@ public abstract class InterestGroupData {
@AutoValue.Builder
@JsonPOJOBuilder(withPrefix = "set")
- public static abstract class Builder {
+ public abstract static class Builder {
public abstract Builder setId(String id);
public abstract Builder setTitle(String title);
public abstract Builder setGitlab(GitlabProject gitlab);
public abstract Builder setLogo(String logo);
public abstract Builder setState(String state);
- public abstract Builder setFoundationdbProjectId(String foundationdbProjectId);
+ public abstract Builder setProjectId(String foundationdbProjectId);
public abstract Builder setDescription(Descriptor description);
public abstract Builder setScope(Descriptor scope);
public abstract Builder setLeads(List<User> leads);
@@ -45,7 +45,7 @@ public abstract class InterestGroupData {
@AutoValue
@JsonDeserialize(builder = AutoValue_InterestGroupData_Descriptor.Builder.class)
- public static abstract class Descriptor {
+ public abstract static class Descriptor {
public abstract String getSummary();
public abstract String getFull();
@@ -55,7 +55,7 @@ public abstract class InterestGroupData {
@AutoValue.Builder
@JsonPOJOBuilder(withPrefix = "set")
- public static abstract class Builder {
+ public abstract static class Builder {
public abstract Builder setSummary(String summary);
public abstract Builder setFull(String full);
public abstract Descriptor build();
diff --git a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
index b4c113c8..c56f56da 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultInterestGroupService.java
@@ -47,7 +47,7 @@ public class DefaultInterestGroupService implements InterestGroupService {
.stream()
.map(ig -> Project
.builder()
- .setProjectId(ig.getFoundationdbProjectId())
+ .setProjectId(ig.getProjectId())
.setGerritRepos(Collections.emptyList())
.setGithubRepos(Collections.emptyList())
.setGitlabRepos(Collections.emptyList())
diff --git a/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java b/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
index 47724820..e52ff5ce 100644
--- a/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
+++ b/src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java
@@ -127,7 +127,7 @@ public class MockProjectsAPI implements ProjectsAPI {
.ok(Arrays
.asList(InterestGroupData
.builder()
- .setFoundationdbProjectId("foundation-internal.ig.mittens")
+ .setProjectId("foundation-internal.ig.mittens")
.setId("1")
.setLogo("")
.setState("active")
--
GitLab