root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Juergen Hoeller 2024-11-13 22:26:54 +01:00
parent 37b110a181 fec6ba4dfe
commit 1c2dbec971
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -81,6 +81,7 @@ public enum DataUnit {
return this.size; return this.size;
} }
/** /**
* Return the {@link DataUnit} matching the specified {@code suffix}. * Return the {@link DataUnit} matching the specified {@code suffix}.
* @param suffix one of the standard suffixes * @param suffix one of the standard suffixes