Skip to content

Commit ba7a2ae

Browse files
committed
Improve logging in case GitHub ID was not set for a user.
1 parent c96a564 commit ba7a2ae

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

core/src/main/java/org/jboss/set/mjolnir/archive/batch/MembershipRemovalBatchlet.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.io.IOException;
3030
import java.sql.Timestamp;
3131
import java.util.List;
32-
import java.util.Objects;
3332
import java.util.Set;
3433
import java.util.stream.Collectors;
3534

@@ -160,7 +159,18 @@ RegisteredUser findRegisteredUser(String krbName) {
160159
*/
161160
String findUsersGitHubName(RegisteredUser registeredUser) {
162161
Integer githubId = registeredUser.getGithubId();
163-
Objects.requireNonNull(githubId, "The GitHub ID for user '%s' in unknown.");
162+
163+
if (githubId == null) {
164+
if (registeredUser.getGithubName() == null) {
165+
logger.warnf("The GitHub username and ID for user '%s' is unknown, user cannot be processed.",
166+
registeredUser.getKerberosName());
167+
} else {
168+
logger.errorf("The GitHub ID for the user '%s' is unknown, even though the GitHub username is set ('%s'). This looks like data inconsistency.",
169+
registeredUser.getKerberosName(), registeredUser.getGithubName());
170+
throw new RuntimeException(String.format("The GitHub ID for the user '%s' is unknown.",
171+
registeredUser.getKerberosName()));
172+
}
173+
}
164174

165175
try {
166176
User githubUser = userService.getUserById(githubId);

0 commit comments

Comments
 (0)