Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Eclipse Foundation
IT
Websites
membership.eclipse.org
Commits
d71153ad
Commit
d71153ad
authored
Dec 14, 2021
by
Martin Lowe
🇨🇦
Browse files
Add patch for more logging and avoiding null returns
parent
051f7e16
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/eclipsefoundation/react/resources/OrganizationResource.java
View file @
d71153ad
...
...
@@ -623,7 +623,7 @@ public class OrganizationResource extends AbstractRESTResource {
// get unique person IDs to query for more details.
List
<
String
>
ids
=
people
.
entrySet
().
stream
().
flatMap
(
e
->
e
.
getValue
().
stream
()).
distinct
()
.
collect
(
Collectors
.
toList
());
LOGGER
.
debug
(
"Found {} people with relations {} for organization {}"
,
ids
.
size
(),
relations
,
organizationID
);
LOGGER
.
info
(
"Found {} people with relations {} for organization {}"
,
ids
.
size
(),
relations
,
organizationID
);
// create the params for cachekey
MultivaluedMap
<
String
,
String
>
params
=
new
MultivaluedMapImpl
<>();
params
.
put
(
DefaultUrlParameterNames
.
IDS
.
getName
(),
ids
);
...
...
@@ -648,7 +648,7 @@ public class OrganizationResource extends AbstractRESTResource {
return
out
;
});
if
(
rawPeopleData
.
isEmpty
())
{
return
null
;
return
Collections
.
emptyList
()
;
}
LOGGER
.
debug
(
"Mapped {} relations of {} for org {}"
,
rawPeopleData
.
get
().
size
(),
ids
.
size
(),
organizationID
);
return
rawPeopleData
.
get
().
stream
().
map
(
p
->
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment