|
13 | 13 | import java.util.Collections; |
14 | 14 | import java.util.HashSet; |
15 | 15 | import java.util.List; |
16 | | -import java.util.Optional; |
17 | 16 | import java.util.Set; |
18 | 17 | import java.util.UUID; |
19 | 18 | import java.util.concurrent.Callable; |
@@ -229,17 +228,21 @@ private JavaUser resolveJavaUserId(SharedFetch sharedFetch, List<? extends JavaU |
229 | 228 |
|
230 | 229 | }) |
231 | 230 | .orElseGet(() -> { |
232 | | - Optional<JavaUser> finalUser = Optional.empty(); |
| 231 | + JavaUser finalUser = null; |
233 | 232 | // ...or username |
234 | 233 | for (final JavaUser existingUser : existing) { |
235 | 234 | if (existingUser.getName().equalsIgnoreCase(user.getName())) { |
236 | 235 | log.debug("Resolved '{}' from existing user entry by name: {}", user.getName(), existingUser); |
237 | | - finalUser = Optional.of(existingUser); |
| 236 | + finalUser = existingUser; |
238 | 237 | } |
239 | 238 | } |
240 | 239 |
|
241 | 240 | if (offline && user.getFlags().contains("offline")) { |
242 | | - return finalUser.orElse(JavaUser.builder().name(user.getName()).build()).setUuid(getOfflineUUID(user.getName())); |
| 241 | + log.debug("Resolved '{}' as offline user", user.getName()); |
| 242 | + if (finalUser == null) { |
| 243 | + finalUser = JavaUser.builder().name(user.getName()).build(); |
| 244 | + } |
| 245 | + return finalUser.setUuid(getOfflineUUID(user.getName())); |
243 | 246 | } |
244 | 247 |
|
245 | 248 | final Path userCacheFile = outputDirectory.resolve("usercache.json"); |
@@ -270,8 +273,8 @@ private JavaUser resolveJavaUserId(SharedFetch sharedFetch, List<? extends JavaU |
270 | 273 | } |
271 | 274 | JavaUser apiUser = userApi.resolveUser(user.getName()); |
272 | 275 |
|
273 | | - if (finalUser.isPresent()) { |
274 | | - return finalUser.get().setUuid(apiUser.getUuid()); |
| 276 | + if (finalUser != null) { |
| 277 | + return finalUser.setUuid(apiUser.getUuid()); |
275 | 278 | }else{ |
276 | 279 | return apiUser; |
277 | 280 | } |
|
0 commit comments