Skip to content

fix: API export CRD failure #15788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pragsty merged 1 commit into from
Mar 30, 2026
+19 −2
Merged

fix: API export CRD failure #15788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ository-jdbc/src/main/java/io/gravitee/repository/jdbc/management/JdbcUserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ public List<User> findByEmail(String email, String organizationId) throws Techni

@Override
public Set<User> findByIds(final Collection<String> ids) throws TechnicalException {
if (ids == null || ids.isEmpty()) {
return Collections.emptySet();
}
final String[] lastId = new String[1];
List<String> uniqueIds = ids
.stream()
Expand Down
3 changes: 3 additions & 0 deletions ...i-service/src/main/java/io/gravitee/apim/infra/crud_service/user/UserCrudServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public Optional<BaseUserEntity> findBaseUserById(String id) {

@Override
public Set<BaseUserEntity> findBaseUsersByIds(List<String> userIds) {
if (userIds == null || userIds.isEmpty()) {
return Set.of();
}
try {
log.debug("Find users [userIds={}]", userIds);
return userRepository.findByIds(userIds).stream().map(UserAdapter.INSTANCE::fromUser).collect(Collectors.toSet());
Expand Down
6 changes: 4 additions & 2 deletions ...rc/main/java/io/gravitee/apim/infra/domain_service/api/ApiCRDExportDomainServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ private void setMembersSourceId(Set<MemberCRD> members) {

membersById.forEach((id, member) -> {
var user = usersById.get(id);
member.setSourceId(user.getSourceId());
member.setSource(user.getSource());
if (user != null) {
member.setSourceId(user.getSourceId());
member.setSource(user.getSource());
}
member.setId(null);
});
}
Expand Down
9 changes: 9 additions & 0 deletions ...rvice/src/test/java/io/gravitee/apim/infra/crud_service/user/UserCrudServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullAndEmptySource;

public class UserCrudServiceImplTest {

Expand Down Expand Up @@ -121,6 +123,13 @@ void should_throw_when_technical_exception_occurs() throws TechnicalException {
@Nested
class FindBaseUserByIds {

@ParameterizedTest
@NullAndEmptySource
void should_return_empty_set_when_user_ids_is_null_or_empty(List<String> userIds) {
var result = service.findBaseUsersByIds(userIds);
assertThat(result).isEmpty();
}

@Test
void should_find_users_and_adapt_them() throws TechnicalException {
// Given
Expand Down