Refactor alwaysUseBytes

prdoyle · prdoyle · commit e0ecc3c07ac9 · 2025-02-21T07:49:32.000-05:00
diff --git a/server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java
@@ -132,13 +132,8 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     private static boolean alwaysUseBytes(TransportVersion tv) {
-        if (tv.between(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1, REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1)) {
-            return true;
-        } else if (tv.isPatchFrom(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)) {
-            return true;
-        } else {
-            return false;
-        }
+        return tv.isPatchFrom(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)
+            || tv.between(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1, REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1);
     }
 
     ByteSizeValue(long sizeInBytes, ByteSizeUnit desiredUnit) {

Original file line number	Diff line number	Diff line change
`@@ -132,13 +132,8 @@ public void writeTo(StreamOutput out) throws IOException {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private static boolean alwaysUseBytes(TransportVersion tv) {`
`135`		`- if (tv.between(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1, REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1)) {`
`136`		`- return true;`
`137`		`- } else if (tv.isPatchFrom(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)) {`
`138`		`- return true;`
`139`		`- } else {`
`140`		`- return false;`
`141`		`- }`
	`135`	`+ return tv.isPatchFrom(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_90)`
	`136`	`+ \|\| tv.between(BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1, REVERT_BYTE_SIZE_VALUE_ALWAYS_USES_BYTES_1);`
`142`	`137`	`}`
`143`	`138`
`144`	`139`	`ByteSizeValue(long sizeInBytes, ByteSizeUnit desiredUnit) {`