Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve DataSize to support negative values

Browse Source 
Issue: SPR-17154
This commit is contained in:
Stephane Nicoll
2018-08-10 18:21:09 +02:00
parent aef39e8954
commit f931a3fb59
2 changed files with 81 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* The pattern for parsing.
*/
private static final Pattern PATTERN = Pattern.compile("^(\\d+)([a-zA-Z]{0,2})$");
private static final Pattern PATTERN = Pattern.compile("^([+\\-]?\\d+)([a-zA-Z]{0,2})$");
/**
* Bytes per KiloByte.
@@ -68,7 +68,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing the specified number of bytes.
* @param bytes the number of bytes
* @param bytes the number of bytes, positive or negative
* @return a {@link DataSize}
*/
public static DataSize ofBytes(long bytes) {
@@ -77,7 +77,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing the specified number of kilobytes.
* @param kiloBytes the number of kilobytes
* @param kiloBytes the number of kilobytes, positive or negative
* @return a {@link DataSize}
*/
public static DataSize ofKiloBytes(long kiloBytes) {
@@ -86,7 +86,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing the specified number of megabytes.
* @param megaBytes the number of megabytes
* @param megaBytes the number of megabytes, positive or negative
* @return a {@link DataSize}
*/
public static DataSize ofMegaBytes(long megaBytes) {
@@ -95,7 +95,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing the specified number of gigabytes.
* @param gigaBytes the number of gigabytes
* @param gigaBytes the number of gigabytes, positive or negative
* @return a {@link DataSize}
*/
public static DataSize ofGigaBytes(long gigaBytes) {
@@ -104,7 +104,7 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing the specified number of terabytes.
* @param teraBytes the number of terabytes
* @param teraBytes the number of terabytes, positive or negative
* @return a {@link DataSize}
*/
public static DataSize ofTeraBytes(long teraBytes) {
@@ -113,7 +113,8 @@ public final class DataSize implements Comparable<DataSize> {
/**
* Obtain a {@link DataSize} representing an amount in the specified {@link DataUnit}.
* @param amount the amount of the size, measured in terms of the unit
* @param amount the amount of the size, measured in terms of the unit, positive or
* negative
* @return a {@link DataSize}
*/
public static DataSize of(long amount, DataUnit unit) {
@@ -177,6 +178,14 @@ public final class DataSize implements Comparable<DataSize> {
: defaultUnit);
}
/**
* Checks if this size is negative, excluding zero.
* @return true if this size has a size less than zero bytes
*/
public boolean isNegative() {
return this.bytes < 0;
}
/**
* Return the number of bytes in this instance.
* @return the number of bytes