Merge pull request #12502 from anuragkumawat/JAVA-13328

JAVA-13328 Update Convert Byte Size Into a Human-Readable Format in Java
This commit is contained in:
kwoyke 2022-07-18 09:44:49 +02:00 committed by GitHub
commit f585f2667b
2 changed files with 117 additions and 37 deletions

View File

@ -7,15 +7,35 @@ import java.util.List;
public class FileSizeFormatUtil { public class FileSizeFormatUtil {
private static final long BYTE = 1L; private static final long BYTE = 1L;
private static final long KB = BYTE << 10; private static final long KiB = BYTE << 10;
private static final long MB = KB << 10; private static final long MiB = KiB << 10;
private static final long GB = MB << 10; private static final long GiB = MiB << 10;
private static final long TB = GB << 10; private static final long TiB = GiB << 10;
private static final long PB = TB << 10; private static final long PiB = TiB << 10;
private static final long EB = PB << 10; private static final long EiB = PiB << 10;
private static final long KB = BYTE * 1000;
private static final long MB = KB * 1000;
private static final long GB = MB * 1000;
private static final long TB = GB * 1000;
private static final long PB = TB * 1000;
private static final long EB = PB * 1000;
private static final DecimalFormat DEC_FORMAT = new DecimalFormat("#.##"); private static final DecimalFormat DEC_FORMAT = new DecimalFormat("#.##");
public static String toHumanReadable(long size) { public static String toHumanReadableBinaryPrefixes(long size) {
if (size < 0)
throw new IllegalArgumentException("Invalid file size: " + size);
if (size >= EiB) return formatSize(size, EiB, "EiB");
if (size >= PiB) return formatSize(size, PiB, "PiB");
if (size >= TiB) return formatSize(size, TiB, "TiB");
if (size >= GiB) return formatSize(size, GiB, "GiB");
if (size >= MiB) return formatSize(size, MiB, "MiB");
if (size >= KiB) return formatSize(size, KiB, "KiB");
return formatSize(size, BYTE, "Bytes");
}
public static String toHumanReadableSIPrefixes(long size) {
if (size < 0) if (size < 0)
throw new IllegalArgumentException("Invalid file size: " + size); throw new IllegalArgumentException("Invalid file size: " + size);
if (size >= EB) return formatSize(size, EB, "EB"); if (size >= EB) return formatSize(size, EB, "EB");
@ -31,18 +51,32 @@ public class FileSizeFormatUtil {
return DEC_FORMAT.format((double) size / divider) + " " + unitName; return DEC_FORMAT.format((double) size / divider) + " " + unitName;
} }
public static String toHumanReadableWithEnum(long size) { public static String toHumanReadableBinaryPrefixesWithEnum(long size) {
final List<SizeUnit> units = SizeUnit.unitsInDescending(); final List<SizeUnitBinaryPrefixes> units = SizeUnitBinaryPrefixes.unitsInDescending();
if (size < 0) if (size < 0)
throw new IllegalArgumentException("Invalid file size: " + size); throw new IllegalArgumentException("Invalid file size: " + size);
String result = null; String result = null;
for (SizeUnit unit : units) { for (SizeUnitBinaryPrefixes unit : units) {
if (size >= unit.getUnitBase()) { if (size >= unit.getUnitBase()) {
result = formatSize(size, unit.getUnitBase(), unit.name()); result = formatSize(size, unit.getUnitBase(), unit.name());
break; break;
} }
} }
return result == null ? formatSize(size, SizeUnit.Bytes.getUnitBase(), SizeUnit.Bytes.name()) : result; return result == null ? formatSize(size, SizeUnitBinaryPrefixes.Bytes.getUnitBase(), SizeUnitBinaryPrefixes.Bytes.name()) : result;
}
public static String toHumanReadableSIPrefixesWithEnum(long size) {
final List<SizeUnitSIPrefixes> units = SizeUnitSIPrefixes.unitsInDescending();
if (size < 0)
throw new IllegalArgumentException("Invalid file size: " + size);
String result = null;
for (SizeUnitSIPrefixes unit : units) {
if (size >= unit.getUnitBase()) {
result = formatSize(size, unit.getUnitBase(), unit.name());
break;
}
}
return result == null ? formatSize(size, SizeUnitSIPrefixes.Bytes.getUnitBase(), SizeUnitSIPrefixes.Bytes.name()) : result;
} }
public static String toHumanReadableByNumOfLeadingZeros(long size) { public static String toHumanReadableByNumOfLeadingZeros(long size) {
@ -50,22 +84,22 @@ public class FileSizeFormatUtil {
throw new IllegalArgumentException("Invalid file size: " + size); throw new IllegalArgumentException("Invalid file size: " + size);
if (size < 1024) return size + " Bytes"; if (size < 1024) return size + " Bytes";
int unitIdx = (63 - Long.numberOfLeadingZeros(size)) / 10; int unitIdx = (63 - Long.numberOfLeadingZeros(size)) / 10;
return formatSize(size, 1L << (unitIdx * 10), " KMGTPE".charAt(unitIdx) + "B"); return formatSize(size, 1L << (unitIdx * 10), " KMGTPE".charAt(unitIdx) + "iB");
} }
enum SizeUnit { enum SizeUnitBinaryPrefixes {
Bytes(1L), Bytes(1L),
KB(Bytes.unitBase << 10), KiB(Bytes.unitBase << 10),
MB(KB.unitBase << 10), MiB(KiB.unitBase << 10),
GB(MB.unitBase << 10), GiB(MiB.unitBase << 10),
TB(GB.unitBase << 10), TiB(GiB.unitBase << 10),
PB(TB.unitBase << 10), PiB(TiB.unitBase << 10),
EB(PB.unitBase << 10); EiB(PiB.unitBase << 10);
private final Long unitBase; private final Long unitBase;
public static List<SizeUnit> unitsInDescending() { public static List<SizeUnitBinaryPrefixes> unitsInDescending() {
List<SizeUnit> list = Arrays.asList(values()); List<SizeUnitBinaryPrefixes> list = Arrays.asList(values());
Collections.reverse(list); Collections.reverse(list);
return list; return list;
} }
@ -74,7 +108,33 @@ public class FileSizeFormatUtil {
return unitBase; return unitBase;
} }
SizeUnit(long unitBase) { SizeUnitBinaryPrefixes(long unitBase) {
this.unitBase = unitBase;
}
}
enum SizeUnitSIPrefixes {
Bytes(1L),
KB(Bytes.unitBase * 1000),
MB(KB.unitBase * 1000),
GB(MB.unitBase * 1000),
TB(GB.unitBase * 1000),
PB(TB.unitBase * 1000),
EB(PB.unitBase * 1000);
private final Long unitBase;
public static List<SizeUnitSIPrefixes> unitsInDescending() {
List<SizeUnitSIPrefixes> list = Arrays.asList(values());
Collections.reverse(list);
return list;
}
public Long getUnitBase() {
return unitBase;
}
SizeUnitSIPrefixes(long unitBase) {
this.unitBase = unitBase; this.unitBase = unitBase;
} }
} }

View File

@ -8,33 +8,53 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class FileSizeFormatUtilUnitTest { public class FileSizeFormatUtilUnitTest {
private final static Map<Long, String> DATA_MAP = new HashMap<Long, String>() {{ private final static Map<Long, String> DATA_MAP_BINARY_PREFIXES = new HashMap<Long, String>() {{
put(0L, "0 Bytes"); put(0L, "0 Bytes");
put(1023L, "1023 Bytes"); put(1023L, "1023 Bytes");
put(1024L, "1 KB"); put(1024L, "1 KiB");
put(12_345L, "12.06 KB"); put(12_345L, "12.06 KiB");
put(10_123_456L, "9.65 MB"); put(10_123_456L, "9.65 MiB");
put(10_123_456_798L, "9.43 GB"); put(10_123_456_798L, "9.43 GiB");
put(1_777_777_777_777_777_777L, "1.54 EB"); put(1_777_777_777_777_777_777L, "1.54 EiB");
}};
private final static Map<Long, String> DATA_MAP_SI_PREFIXES = new HashMap<Long, String>() {{
put(0L, "0 Bytes");
put(999L, "999 Bytes");
put(1000L, "1 KB");
put(12_345L, "12.35 KB");
put(10_123_456L, "10.12 MB");
put(10_123_456_798L, "10.12 GB");
put(1_777_777_777_777_777_777L, "1.78 EB");
}}; }};
@Test @Test
public void givenBytes_whenCalltoHumanReadableMethod_thenGetExpectedResults() { public void givenBytes_whenCalltoHumanReadableBinaryPrefixesMethod_thenGetExpectedResults() {
DATA_MAP.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadable(in))); DATA_MAP_BINARY_PREFIXES.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableBinaryPrefixes(in)));
} }
@Test @Test
public void givenBytes_whenCalltoHumanReadableWithEnumMethod_thenGetExpectedResults() { public void givenBytes_whenCalltoHumanReadableSIPrefixesMethod_thenGetExpectedResults() {
DATA_MAP.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableWithEnum(in))); DATA_MAP_SI_PREFIXES.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableSIPrefixes(in)));
}
@Test
public void givenBytes_whenCalltoHumanReadableBinaryPrefixesWithEnumMethod_thenGetExpectedResults() {
DATA_MAP_BINARY_PREFIXES.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableBinaryPrefixesWithEnum(in)));
}
@Test
public void givenBytes_whenCalltoHumanReadableSIPrefixesWithEnumMethod_thenGetExpectedResults() {
DATA_MAP_SI_PREFIXES.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableSIPrefixesWithEnum(in)));
} }
@Test @Test
public void givenBytes_whenCalltoHumanReadableByLeadingZeros_thenGetExpectedResults() { public void givenBytes_whenCalltoHumanReadableByLeadingZeros_thenGetExpectedResults() {
DATA_MAP.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableByNumOfLeadingZeros(in))); DATA_MAP_BINARY_PREFIXES.forEach((in, expected) -> Assert.assertEquals(expected, FileSizeFormatUtil.toHumanReadableByNumOfLeadingZeros(in)));
} }
@Test @Test
public void givenBytes_whenCalltoHumanReadableByFileUtils_thenOutputExpectedResults() { public void givenBytes_whenCalltoHumanReadableByFileUtils_thenOutputExpectedResults() {
DATA_MAP.forEach((in, expected) -> System.out.println(in + " bytes -> " + FileUtils.byteCountToDisplaySize(in))); DATA_MAP_BINARY_PREFIXES.forEach((in, expected) -> System.out.println(in + " bytes -> " + FileUtils.byteCountToDisplaySize(in)));
} }
} }