Browse Source

Polishing

pull/34008/head
Juergen Hoeller 1 year ago
parent
commit
fec6ba4dfe
  1. 16
      spring-core/src/main/java/org/springframework/util/unit/DataSize.java
  2. 3
      spring-core/src/main/java/org/springframework/util/unit/DataUnit.java

16
spring-core/src/main/java/org/springframework/util/unit/DataSize.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"); * 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.
@ -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>
@ -247,14 +246,14 @@ public final class DataSize implements Comparable<DataSize>, Serializable {
@Override @Override
public boolean equals(@Nullable Object obj) { public boolean equals(@Nullable Object other) {
if (this == obj) { if (this == other) {
return true; return true;
} }
if (obj == null || getClass() != obj.getClass()) { if (other == null || getClass() != other.getClass()) {
return false; return false;
} }
DataSize that = (DataSize) obj; DataSize that = (DataSize) other;
return (this.bytes == that.bytes); return (this.bytes == that.bytes);
} }
@ -279,7 +278,6 @@ public final class DataSize implements Comparable<DataSize>, Serializable {
DataUnit defaultUnitToUse = (defaultUnit != null ? defaultUnit : DataUnit.BYTES); DataUnit defaultUnitToUse = (defaultUnit != null ? defaultUnit : DataUnit.BYTES);
return (StringUtils.hasLength(suffix) ? DataUnit.fromSuffix(suffix) : defaultUnitToUse); return (StringUtils.hasLength(suffix) ? DataUnit.fromSuffix(suffix) : defaultUnitToUse);
} }
} }
} }

3
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"); * 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

Loading…
Cancel
Save