diff --git a/pom.xml b/pom.xml
index 6c4f324492031dffd357dc3d4b9baef81c888d90..8a2754cdb16e697950962e8f9663e52dfda18423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,16 +8,16 @@
<version>1.0.0-SNAPSHOT</version>
<properties>
- <eclipse-api-version>1.1.7</eclipse-api-version>
- <compiler-plugin.version>3.11.0</compiler-plugin.version>
+ <eclipse-api-version>1.2.0</eclipse-api-version>
+ <compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
- <quarkus.platform.version>3.8.6</quarkus.platform.version>
- <surefire-plugin.version>3.1.2</surefire-plugin.version>
+ <quarkus.platform.version>3.15.3</quarkus.platform.version>
+ <surefire-plugin.version>3.3.1</surefire-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
<sonar.sources>src/main</sonar.sources>
diff --git a/src/main/java/org/eclipsefoundation/mailing/resources/MailingListsResource.java b/src/main/java/org/eclipsefoundation/mailing/resources/MailingListsResource.java
index f5e55d5ae1776086d49f27e918c2b58e8797ef07..3db1500e86a7f56a30eb58e554adf37e141cd02c 100644
--- a/src/main/java/org/eclipsefoundation/mailing/resources/MailingListsResource.java
+++ b/src/main/java/org/eclipsefoundation/mailing/resources/MailingListsResource.java
@@ -81,9 +81,9 @@ public class MailingListsResource {
}
// Add email to params if it exists
- if (StringUtils.isNotBlank(user.get().getMail())) {
- LOGGER.debug("Adding email '{}'' to query params", user.get().getMail());
- params.add(MailingListUrlParameterNames.USER_EMAIL.getName(), user.get().getMail());
+ if (StringUtils.isNotBlank(user.get().mail())) {
+ LOGGER.debug("Adding email '{}'' to query params", user.get().mail());
+ params.add(MailingListUrlParameterNames.USER_EMAIL.getName(), user.get().mail());
}
}
return Response.ok(dao.get(new RDBMSQuery<>(wrap, filters.get(MailingLists.class), params))).build();
diff --git a/src/test/java/org/eclipsefoundation/mailing/test/api/MockProfileAPI.java b/src/test/java/org/eclipsefoundation/mailing/test/api/MockProfileAPI.java
index 3f6e5feb3edb5ffffb8b1bbc84a6c26892423ae7..ce70b814d42c66fa46deb359c5a580f8182fb745 100644
--- a/src/test/java/org/eclipsefoundation/mailing/test/api/MockProfileAPI.java
+++ b/src/test/java/org/eclipsefoundation/mailing/test/api/MockProfileAPI.java
@@ -21,7 +21,8 @@ import org.apache.commons.lang3.StringUtils;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.eclipsefoundation.efservices.api.ProfileAPI;
import org.eclipsefoundation.efservices.api.models.EfUser;
-import org.eclipsefoundation.efservices.api.models.EfUser.Country;
+import org.eclipsefoundation.efservices.api.models.EfUserBuilder;
+import org.eclipsefoundation.efservices.api.models.EfUserCountryBuilder;
import org.eclipsefoundation.efservices.api.models.UserSearchParams;
import io.quarkus.test.Mock;
@@ -39,23 +40,23 @@ public class MockProfileAPI implements ProfileAPI {
this.users = new ArrayList<>();
this.users
.addAll(Arrays
- .asList(EfUser
+ .asList(EfUserBuilder
.builder()
- .setUid("42")
- .setName("testytesterson")
- .setFullName("Testy Testerson")
- .setGithubHandle("handle")
- .setMail("testy@test.com")
- .setPicture("pic url")
- .setFirstName("Testy")
- .setLastName("Testerson")
- .setPublisherAgreements(new HashMap<>())
- .setTwitterHandle("")
- .setOrg("")
- .setJobTitle("employee")
- .setWebsite("site url")
- .setCountry(Country.builder().build())
- .setInterests(Arrays.asList())
+ .uid("42")
+ .name("testytesterson")
+ .fullName("Testy Testerson")
+ .githubHandle("handle")
+ .mail("testy@test.com")
+ .picture("pic url")
+ .firstName("Testy")
+ .lastName("Testerson")
+ .publisherAgreements(new HashMap<>())
+ .twitterHandle("")
+ .org("")
+ .jobTitle("employee")
+ .website("site url")
+ .country(EfUserCountryBuilder.builder().build())
+ .interests(Arrays.asList())
.build()));
}
@@ -69,15 +70,15 @@ public class MockProfileAPI implements ProfileAPI {
// Only filter via additional fields if it can't find with previous ones
if (params.uid != null) {
- results = users.stream().filter(u -> u.getUid().compareTo(params.uid) == 0)
+ results = users.stream().filter(u -> u.uid().compareTo(params.uid) == 0)
.toList();
}
if (StringUtils.isNotBlank(params.name) && results.isEmpty()) {
- results = users.stream().filter(u -> u.getName().equalsIgnoreCase(params.name))
+ results = users.stream().filter(u -> u.name().equalsIgnoreCase(params.name))
.toList();
}
if (StringUtils.isNotBlank(params.mail) && results.isEmpty()) {
- results = users.stream().filter(u -> u.getMail().equalsIgnoreCase(params.mail))
+ results = users.stream().filter(u -> u.mail().equalsIgnoreCase(params.mail))
.toList();
}
@@ -88,7 +89,7 @@ public class MockProfileAPI implements ProfileAPI {
public EfUser getUserByEfUsername(String token, String username) {
return users
.stream()
- .filter(u -> u.getName().equalsIgnoreCase(username))
+ .filter(u -> u.name().equalsIgnoreCase(username))
.findFirst()
.orElseThrow(() -> new NotFoundException(String.format("User '%s' not found", username)));
}
@@ -97,7 +98,7 @@ public class MockProfileAPI implements ProfileAPI {
public EfUser getUserByGithubHandle(String token, String handle) {
return users
.stream()
- .filter(u -> u.getGithubHandle().equalsIgnoreCase(handle))
+ .filter(u -> u.githubHandle().equalsIgnoreCase(handle))
.findFirst()
.orElseThrow(() -> new NotFoundException(String.format("User '%s' not found", handle)));
}