Skip to content

Commit f6c27a7

Browse files
committed
fix: removed unnecessary Optional
1 parent af1d2e7 commit f6c27a7

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/main/java/me/itzg/helpers/users/ManageUsersCommand.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import java.util.Collections;
1414
import java.util.HashSet;
1515
import java.util.List;
16-
import java.util.Optional;
1716
import java.util.Set;
1817
import java.util.UUID;
1918
import java.util.concurrent.Callable;
@@ -229,17 +228,21 @@ private JavaUser resolveJavaUserId(SharedFetch sharedFetch, List<? extends JavaU
229228

230229
})
231230
.orElseGet(() -> {
232-
Optional<JavaUser> finalUser = Optional.empty();
231+
JavaUser finalUser = null;
233232
// ...or username
234233
for (final JavaUser existingUser : existing) {
235234
if (existingUser.getName().equalsIgnoreCase(user.getName())) {
236235
log.debug("Resolved '{}' from existing user entry by name: {}", user.getName(), existingUser);
237-
finalUser = Optional.of(existingUser);
236+
finalUser = existingUser;
238237
}
239238
}
240239

241240
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()));
243246
}
244247

245248
final Path userCacheFile = outputDirectory.resolve("usercache.json");
@@ -270,8 +273,8 @@ private JavaUser resolveJavaUserId(SharedFetch sharedFetch, List<? extends JavaU
270273
}
271274
JavaUser apiUser = userApi.resolveUser(user.getName());
272275

273-
if (finalUser.isPresent()) {
274-
return finalUser.get().setUuid(apiUser.getUuid());
276+
if (finalUser != null) {
277+
return finalUser.setUuid(apiUser.getUuid());
275278
}else{
276279
return apiUser;
277280
}

0 commit comments

Comments
 (0)