HV-1300 Avoid creating new Optionals for each comparison

gsmet · gsmet · commit 4f023c975388 · 2017-05-11T16:22:27.000+02:00
Also use OptionalInt as it's exactly what it is for.
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/InfinityNumberComparatorHelper.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/InfinityNumberComparatorHelper.java
@@ -4,44 +4,47 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;
+package org.hibernate.validator.internal.constraintvalidators.bv.number;
 
-import java.util.Optional;
+import java.util.OptionalInt;
 
 /**
  * @author Marko Bekhta
  */
 public final class InfinityNumberComparatorHelper {
 
+	public static final OptionalInt LESS_THAN = OptionalInt.of( -1 );
+	public static final OptionalInt FINITE_VALUE = OptionalInt.empty();
+	public static final OptionalInt GREATER_THAN = OptionalInt.of( 1 );
+
 	private InfinityNumberComparatorHelper() {
 	}
 
-	public static Optional<Integer> infinityCheck(Double number, int treatNanAs) {
-		Integer result = null;
+	public static OptionalInt infinityCheck(Double number, OptionalInt treatNanAs) {
+		OptionalInt result = FINITE_VALUE;
 		if ( number == Double.NEGATIVE_INFINITY ) {
-			result = -1;
+			result = LESS_THAN;
 		}
 		else if ( number.isNaN() ) {
 			result = treatNanAs;
 		}
 		else if ( number == Double.POSITIVE_INFINITY ) {
-			result = 1;
+			result = GREATER_THAN;
 		}
-		return Optional.ofNullable( result );
+		return result;
 	}
 
-	public static Optional<Integer> infinityCheck(Float number, int treatNanAs) {
-		Integer result = null;
+	public static OptionalInt infinityCheck(Float number, OptionalInt treatNanAs) {
+		OptionalInt result = FINITE_VALUE;
 		if ( number == Float.NEGATIVE_INFINITY ) {
-			result = -1;
+			result = LESS_THAN;
 		}
 		else if ( number.isNaN() ) {
 			result = treatNanAs;
 		}
 		else if ( number == Float.POSITIVE_INFINITY ) {
-			result = 1;
+			result = GREATER_THAN;
 		}
-		return Optional.ofNullable( result );
+		return result;
 	}
-
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MaxValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MaxValidatorForDouble.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is less than or equal to the maximum
  * value specified.
@@ -16,6 +18,6 @@ public class MaxValidatorForDouble extends BaseMaxValidator<Double> {
 
 	@Override
 	protected int compare(Double number) {
-		return NumberComparatorHelper.compare( number, maxValue, 1 );
+		return NumberComparatorHelper.compare( number, maxValue, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MaxValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MaxValidatorForFloat.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is less than or equal to the maximum
  * value specified.
@@ -16,6 +18,6 @@ public class MaxValidatorForFloat extends BaseMaxValidator<Float> {
 
 	@Override
 	protected int compare(Float number) {
-		return NumberComparatorHelper.compare( number, maxValue, 1 );
+		return NumberComparatorHelper.compare( number, maxValue, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MinValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MinValidatorForDouble.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is greater than or equal to the minimum
  * value specified.
@@ -16,6 +18,6 @@ public class MinValidatorForDouble extends BaseMinValidator<Double> {
 
 	@Override
 	protected int compare(Double number) {
-		return NumberComparatorHelper.compare( number, minValue, -1 );
+		return NumberComparatorHelper.compare( number, minValue, InfinityNumberComparatorHelper.LESS_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MinValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/MinValidatorForFloat.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is greater than or equal to the minimum
  * value specified.
@@ -16,6 +18,6 @@ public class MinValidatorForFloat extends BaseMinValidator<Float> {
 
 	@Override
 	protected int compare(Float number) {
-		return NumberComparatorHelper.compare( number, minValue, -1 );
+		return NumberComparatorHelper.compare( number, minValue, InfinityNumberComparatorHelper.LESS_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/NumberComparatorHelper.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/NumberComparatorHelper.java
@@ -8,12 +8,14 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Optional;
+import java.util.OptionalInt;
+
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
 
 /**
  * @author Marko Bekhta
  */
-public final class NumberComparatorHelper {
+final class NumberComparatorHelper {
 
 	private NumberComparatorHelper() {
 	}
@@ -34,20 +36,19 @@ public static int compare(Number number, long value) {
 		return Long.compare( number.longValue(), value );
 	}
 
-	public static int compare(Double number, long value, int treatNanAs) {
-		Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
+	public static int compare(Double number, long value, OptionalInt treatNanAs) {
+		OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
 		if ( infinity.isPresent() ) {
-			return infinity.get();
+			return infinity.getAsInt();
 		}
 		return Long.compare( number.longValue(), value );
 	}
 
-	public static int compare(Float number, long value, int treatNanAs) {
-		Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
+	public static int compare(Float number, long value, OptionalInt treatNanAs) {
+		OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
 		if ( infinity.isPresent() ) {
-			return infinity.get();
+			return infinity.getAsInt();
 		}
 		return Long.compare( number.longValue(), value );
 	}
-
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMaxValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMaxValidatorForDouble.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound.decimal;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is less than or equal to the maximum
  * value specified.
@@ -15,6 +17,6 @@
 public class DecimalMaxValidatorForDouble extends BaseDecimalMaxValidator<Double> {
 
 	@Override protected int compare(Double number) {
-		return DecimalNumberComparatorHelper.compare( number, maxValue, 1 );
+		return DecimalNumberComparatorHelper.compare( number, maxValue, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMaxValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMaxValidatorForFloat.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound.decimal;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is less than or equal to the maximum
  * value specified.
@@ -15,6 +17,6 @@
 public class DecimalMaxValidatorForFloat extends BaseDecimalMaxValidator<Float> {
 
 	@Override protected int compare(Float number) {
-		return DecimalNumberComparatorHelper.compare( number, maxValue, 1 );
+		return DecimalNumberComparatorHelper.compare( number, maxValue, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMinValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMinValidatorForDouble.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound.decimal;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is greater than or equal to the minimum
  * value specified.
@@ -15,6 +17,6 @@
 public class DecimalMinValidatorForDouble extends BaseDecimalMinValidator<Double> {
 
 	@Override protected int compare(Double number) {
-		return DecimalNumberComparatorHelper.compare( number, minValue, -1 );
+		return DecimalNumberComparatorHelper.compare( number, minValue, InfinityNumberComparatorHelper.LESS_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMinValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalMinValidatorForFloat.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.bound.decimal;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is greater than or equal to the minimum
  * value specified.
@@ -15,6 +17,6 @@
 public class DecimalMinValidatorForFloat extends BaseDecimalMinValidator<Float> {
 
 	@Override protected int compare(Float number) {
-		return DecimalNumberComparatorHelper.compare( number, minValue, -1 );
+		return DecimalNumberComparatorHelper.compare( number, minValue, InfinityNumberComparatorHelper.LESS_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalNumberComparatorHelper.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/bound/decimal/DecimalNumberComparatorHelper.java
@@ -8,14 +8,14 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Optional;
+import java.util.OptionalInt;
 
-import org.hibernate.validator.internal.constraintvalidators.bv.number.bound.InfinityNumberComparatorHelper;
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
 
 /**
  * @author Marko Bekhta
  */
-public final class DecimalNumberComparatorHelper {
+final class DecimalNumberComparatorHelper {
 
 	private DecimalNumberComparatorHelper() {
 	}
@@ -36,18 +36,18 @@ public static int compare(Number number, BigDecimal value) {
 		return BigDecimal.valueOf( number.doubleValue() ).compareTo( value );
 	}
 
-	public static int compare(Double number, BigDecimal value, int treatNanAs) {
-		Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
+	public static int compare(Double number, BigDecimal value, OptionalInt treatNanAs) {
+		OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
 		if ( infinity.isPresent() ) {
-			return infinity.get();
+			return infinity.getAsInt();
 		}
 		return BigDecimal.valueOf( number ).compareTo( value );
 	}
 
-	public static int compare(Float number, BigDecimal value, int treatNanAs) {
-		Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
+	public static int compare(Float number, BigDecimal value, OptionalInt treatNanAs) {
+		OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );
 		if ( infinity.isPresent() ) {
-			return infinity.get();
+			return infinity.getAsInt();
 		}
 		return BigDecimal.valueOf( number ).compareTo( value );
 	}
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForBigDecimal.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForBigDecimal.java
@@ -20,6 +20,6 @@ public class NegativeValidatorForBigDecimal extends BaseNegativeValidator<BigDec
 
 	@Override
 	protected int compare(BigDecimal number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForBigInteger.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForBigInteger.java
@@ -20,6 +20,6 @@ public class NegativeValidatorForBigInteger extends BaseNegativeValidator<BigInt
 
 	@Override
 	protected int compare(BigInteger number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForByte.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForByte.java
@@ -18,6 +18,6 @@ public class NegativeValidatorForByte extends BaseNegativeValidator<Byte> {
 
 	@Override
 	protected int compare(Byte number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForDouble.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.sign;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is negative.
  *
@@ -18,6 +20,6 @@ public class NegativeValidatorForDouble extends BaseNegativeValidator<Double> {
 
 	@Override
 	protected int compare(Double number) {
-		return NumberSignumHelper.signum( number, 1 );
+		return NumberSignHelper.signum( number, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForFloat.java
@@ -6,6 +6,8 @@
  */
 package org.hibernate.validator.internal.constraintvalidators.bv.number.sign;
 
+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;
+
 /**
  * Check that the number being validated is negative.
  *
@@ -18,6 +20,6 @@ public class NegativeValidatorForFloat extends BaseNegativeValidator<Float> {
 
 	@Override
 	protected int compare(Float number) {
-		return NumberSignumHelper.signum( number, 1 );
+		return NumberSignHelper.signum( number, InfinityNumberComparatorHelper.GREATER_THAN );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForInteger.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForInteger.java
@@ -18,6 +18,6 @@ public class NegativeValidatorForInteger extends BaseNegativeValidator<Integer>
 
 	@Override
 	protected int compare(Integer number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForLong.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForLong.java
@@ -18,6 +18,6 @@ public class NegativeValidatorForLong extends BaseNegativeValidator<Long> {
 
 	@Override
 	protected int compare(Long number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForNumber.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForNumber.java
@@ -18,6 +18,6 @@ public class NegativeValidatorForNumber extends BaseNegativeValidator<Number> {
 
 	@Override
 	protected int compare(Number value) {
-		return NumberSignumHelper.signum( value );
+		return NumberSignHelper.signum( value );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForShort.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NegativeValidatorForShort.java
@@ -18,6 +18,6 @@ public class NegativeValidatorForShort extends BaseNegativeValidator<Short> {
 
 	@Override
 	protected int compare(Short number) {
-		return NumberSignumHelper.signum( number );
+		return NumberSignHelper.signum( number );
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NumberSignHelper.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/NumberSignHelper.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForByte.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForByte.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForDouble.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForDouble.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForFloat.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForFloat.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForInteger.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForInteger.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForLong.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForLong.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForNumber.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForNumber.java
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForShort.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/bv/number/sign/PositiveValidatorForShort.java

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`*/`
`7`	`7`	`package org.hibernate.validator.internal.constraintvalidators.bv.number.bound;`
`8`	`8`
	`9`	`+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;`
	`10`	`+`
`9`	`11`	`/**`
`10`	`12`	`* Check that the number being validated is less than or equal to the maximum`
`11`	`13`	`* value specified.`
`@@ -16,6 +18,6 @@ public class MaxValidatorForDouble extends BaseMaxValidator<Double> {`
`16`	`18`
`17`	`19`	`@Override`
`18`	`20`	`protected int compare(Double number) {`
`19`		`- return NumberComparatorHelper.compare( number, maxValue, 1 );`
	`21`	`+ return NumberComparatorHelper.compare( number, maxValue, InfinityNumberComparatorHelper.GREATER_THAN );`
`20`	`22`	`}`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,14 @@`
`8`	`8`
`9`	`9`	`import java.math.BigDecimal;`
`10`	`10`	`import java.math.BigInteger;`
`11`		`-import java.util.Optional;`
	`11`	`+import java.util.OptionalInt;`
	`12`	`+`
	`13`	`+import org.hibernate.validator.internal.constraintvalidators.bv.number.InfinityNumberComparatorHelper;`
`12`	`14`
`13`	`15`	`/**`
`14`	`16`	`* @author Marko Bekhta`
`15`	`17`	`*/`
`16`		`-public final class NumberComparatorHelper {`
	`18`	`+final class NumberComparatorHelper {`
`17`	`19`
`18`	`20`	`private NumberComparatorHelper() {`
`19`	`21`	`}`
`@@ -34,20 +36,19 @@ public static int compare(Number number, long value) {`
`34`	`36`	`return Long.compare( number.longValue(), value );`
`35`	`37`	`}`
`36`	`38`
`37`		`- public static int compare(Double number, long value, int treatNanAs) {`
`38`		`- Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );`
	`39`	`+ public static int compare(Double number, long value, OptionalInt treatNanAs) {`
	`40`	`+ OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );`
`39`	`41`	`if ( infinity.isPresent() ) {`
`40`		`- return infinity.get();`
	`42`	`+ return infinity.getAsInt();`
`41`	`43`	`}`
`42`	`44`	`return Long.compare( number.longValue(), value );`
`43`	`45`	`}`
`44`	`46`
`45`		`- public static int compare(Float number, long value, int treatNanAs) {`
`46`		`- Optional<Integer> infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );`
	`47`	`+ public static int compare(Float number, long value, OptionalInt treatNanAs) {`
	`48`	`+ OptionalInt infinity = InfinityNumberComparatorHelper.infinityCheck( number, treatNanAs );`
`47`	`49`	`if ( infinity.isPresent() ) {`
`48`		`- return infinity.get();`
	`50`	`+ return infinity.getAsInt();`
`49`	`51`	`}`
`50`	`52`	`return Long.compare( number.longValue(), value );`
`51`	`53`	`}`
`52`		`-`
`53`	`54`	`}`