Merge branch '6.1.x'

Author: jhoeller

spring-core/src/main/java/org/springframework/util/unit/DataSize.java

@@ -25,9 +25,8 @@
 import org.springframework.util.StringUtils;
 
 /**
- * A data size, such as '12MB'.
- *
- * <p>This class models data size in terms of bytes and is immutable and thread-safe.
+ * A data size, such as '12MB'. This class models data size in terms of
+ * bytes and is immutable and thread-safe.
  *
  * <p>The terms and units used in this class are based on
  * <a href="https://en.wikipedia.org/wiki/Binary_prefix">binary prefixes</a>

spring-core/src/main/java/org/springframework/util/unit/DataUnit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -81,6 +81,7 @@ DataSize size() {
 		return this.size;
 	}
 
+
 	/**
 	 * Return the {@link DataUnit} matching the specified {@code suffix}.
 	 * @param suffix one of the standard suffixes