Skip to content
Snippets Groups Projects

update: upgrade to Quarkus 3.15 LTS and latest commons lib

Merged Martin Lowe requested to merge malowe/main/q-3.15-update into main
2 files
+ 10
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -25,7 +25,7 @@ import java.util.Set;
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Collectors;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.eclipsefoundation.caching.model.ParameterizedCacheKey;
import org.eclipsefoundation.caching.model.ParameterizedCacheKeyBuilder;
import org.eclipsefoundation.caching.service.CachingService;
import org.eclipsefoundation.caching.service.CachingService;
import org.eclipsefoundation.caching.service.LoadingCacheManager;
import org.eclipsefoundation.caching.service.LoadingCacheManager;
import org.eclipsefoundation.core.service.APIMiddleware;
import org.eclipsefoundation.core.service.APIMiddleware;
@@ -226,11 +226,11 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
@@ -226,11 +226,11 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
*/
*/
private MemberOrganizationLogos getOrgLogosById(int orgId) {
private MemberOrganizationLogos getOrgLogosById(int orgId) {
List<MemberOrganization> memberOrgs = cacheManager
List<MemberOrganization> memberOrgs = cacheManager
.getList(ParameterizedCacheKey
.getList(ParameterizedCacheKeyBuilder
.builder()
.builder()
.setId("all")
.id("all")
.setClazz(MemberOrganization.class)
.clazz(MemberOrganization.class)
.setParams(new MultivaluedHashMap<>())
.params(new MultivaluedHashMap<>())
.build());
.build());
// Return null logos object if none found
// Return null logos object if none found
@@ -253,7 +253,7 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
@@ -253,7 +253,7 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
.stream()
.stream()
.filter(relation -> WorkingGroupsHelper.filterRelationsByPrefix(relation.relation(), groupPrefix))
.filter(relation -> WorkingGroupsHelper.filterRelationsByPrefix(relation.relation(), groupPrefix))
.toList())
.toList())
.getData();
.data();
if (relations.isEmpty()) {
if (relations.isEmpty()) {
LOGGER.warn("Could not find any Relations of type '{}', there may be a connection error", relationType);
LOGGER.warn("Could not find any Relations of type '{}', there may be a connection error", relationType);
@@ -277,7 +277,7 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
@@ -277,7 +277,7 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
Optional<List<FullOrganizationContactData>> orgContacts = cache
Optional<List<FullOrganizationContactData>> orgContacts = cache
.get(alias, new MultivaluedHashMap<>(), FullOrganizationContactData.class,
.get(alias, new MultivaluedHashMap<>(), FullOrganizationContactData.class,
() -> middleware.getAll(r -> fdbAPI.getFullContacts(r, documentIds)))
() -> middleware.getAll(r -> fdbAPI.getFullContacts(r, documentIds)))
.getData();
.data();
if (orgContacts.isEmpty()) {
if (orgContacts.isEmpty()) {
LOGGER.warn("Could not find any OrgContacts for '{}', there may be a connection error", TransformationHelper.formatLog(alias));
LOGGER.warn("Could not find any OrgContacts for '{}', there may be a connection error", TransformationHelper.formatLog(alias));
Loading