diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
index 93c946ec6760..c0a1d9a2bf6f 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -255,7 +255,7 @@ else if (ch == '"') {
 				nextIndex++;
 			}
 			String parameter = mimeType.substring(index + 1, nextIndex).trim();
-			if (parameter.length() > 0) {
+			if (!parameter.isEmpty()) {
 				if (parameters == null) {
 					parameters = new LinkedHashMap<>(4);
 				}
diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index a4b5822351a6..13b6f6a3cb4d 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -904,8 +904,8 @@ public static String nullSafeConciseToString(@Nullable Object obj) {
 			return NULL_STRING;
 		}
 		if (obj instanceof Optional<?> optional) {
-			return (optional.isEmpty() ? "Optional.empty" :
-				"Optional[%s]".formatted(nullSafeConciseToString(optional.get())));
+			return optional.map(o -> "Optional[%s]".formatted(nullSafeConciseToString(o)))
+				.orElse("Optional.empty");
 		}
 		if (obj.getClass().isArray()) {
 			return (Array.getLength(obj) == 0 ? EMPTY_ARRAY : NON_EMPTY_ARRAY);