From c58c6234544d17935d818f78c26e780767fb2a41 Mon Sep 17 00:00:00 2001 From: handsomewu6688-design Date: Tue, 19 May 2026 17:56:35 +0800 Subject: [PATCH] Upgrade Java source/target from 8 to 17 - Apply instanceof pattern matching - Add @Serial annotation to serialVersionUID fields - Convert String.format to .formatted - Replace Paths.get with Path.of - Convert multiline strings to text blocks All modules build successfully with JDK 17. --- .../commons/math4/examples/sofm/tsp/City.java | 3 +- .../commons/math4/legacy/core/dfp/Dfp.java | 3 +- .../AccurateMathStrictComparisonTest.java | 10 ++-- .../legacy/core/jdkmath/AccurateMathTest.java | 4 +- .../exception/ConvergenceException.java | 3 ++ .../exception/DimensionMismatchException.java | 3 ++ .../exception/InsufficientDataException.java | 3 ++ .../exception/MathArithmeticException.java | 3 ++ .../MathIllegalArgumentException.java | 3 ++ .../exception/MathIllegalNumberException.java | 3 ++ .../exception/MathIllegalStateException.java | 3 ++ .../legacy/exception/MathInternalError.java | 3 ++ .../legacy/exception/MathParseException.java | 3 ++ .../exception/MathRuntimeException.java | 3 ++ .../MathUnsupportedOperationException.java | 3 ++ .../exception/MaxCountExceededException.java | 3 ++ .../MultiDimensionMismatchException.java | 3 ++ .../exception/NoBracketingException.java | 3 ++ .../legacy/exception/NoDataException.java | 3 ++ .../NonMonotonicSequenceException.java | 3 ++ .../legacy/exception/NotANumberException.java | 3 ++ .../exception/NotFiniteNumberException.java | 3 ++ .../exception/NotPositiveException.java | 3 ++ .../NotStrictlyPositiveException.java | 3 ++ .../exception/NullArgumentException.java | 3 ++ .../exception/NumberIsTooLargeException.java | 3 ++ .../exception/NumberIsTooSmallException.java | 3 ++ .../legacy/exception/OutOfRangeException.java | 3 ++ .../TooManyEvaluationsException.java | 3 ++ .../exception/TooManyIterationsException.java | 3 ++ .../math4/legacy/exception/ZeroException.java | 3 ++ .../math4/legacy/exception/util/ArgUtils.java | 4 +- .../exception/util/DummyLocalizable.java | 2 + .../exception/util/ExceptionContext.java | 2 + .../differentiation/DerivativeStructure.java | 3 +- .../differentiation/SparseGradient.java | 3 +- ...eNormalMixtureExpectationMaximization.java | 4 +- .../legacy/field/linalg/FieldDenseMatrix.java | 3 +- .../genetics/AbstractListChromosome.java | 2 +- .../math4/legacy/genetics/ChromosomePair.java | 2 +- .../InvalidRepresentationException.java | 3 ++ .../math4/legacy/genetics/RandomKey.java | 2 +- .../legacy/linear/AbstractRealMatrix.java | 8 +-- .../legacy/linear/Array2DRowFieldMatrix.java | 2 + .../legacy/linear/Array2DRowRealMatrix.java | 2 + .../math4/legacy/linear/ArrayFieldVector.java | 2 + .../math4/legacy/linear/ArrayRealVector.java | 50 ++++++++++--------- .../commons/math4/legacy/linear/BigReal.java | 6 ++- .../math4/legacy/linear/BigRealField.java | 2 + .../math4/legacy/linear/BlockFieldMatrix.java | 2 + .../math4/legacy/linear/BlockRealMatrix.java | 30 +++++------ .../DefaultIterativeLinearSolverEvent.java | 3 ++ .../math4/legacy/linear/DiagonalMatrix.java | 10 ++-- .../IllConditionedOperatorException.java | 3 ++ .../math4/legacy/linear/IterationEvent.java | 2 + .../linear/IterativeLinearSolverEvent.java | 3 ++ .../legacy/linear/JacobiPreconditioner.java | 3 +- .../MatrixDimensionMismatchException.java | 3 ++ .../math4/legacy/linear/MatrixUtils.java | 4 +- .../NonPositiveDefiniteMatrixException.java | 3 ++ .../NonPositiveDefiniteOperatorException.java | 3 ++ .../NonSelfAdjointOperatorException.java | 3 ++ .../linear/NonSquareMatrixException.java | 3 ++ .../linear/NonSquareOperatorException.java | 3 ++ .../linear/NonSymmetricMatrixException.java | 3 ++ .../legacy/linear/OpenIntToDoubleHashMap.java | 2 + .../legacy/linear/OpenIntToFieldHashMap.java | 2 + .../legacy/linear/OpenMapRealMatrix.java | 10 ++-- .../legacy/linear/OpenMapRealVector.java | 26 +++++----- .../linear/SingularMatrixException.java | 3 ++ .../linear/SingularOperatorException.java | 3 ++ .../legacy/linear/SparseFieldVector.java | 2 + .../legacy/ode/ContinuousOutputModel.java | 2 + .../math4/legacy/ode/EquationsMapper.java | 2 + .../legacy/ode/FieldEquationsMapper.java | 2 + .../math4/legacy/ode/JacobianMatrices.java | 4 +- .../math4/legacy/ode/MultistepIntegrator.java | 4 +- .../legacy/ode/ParameterConfiguration.java | 2 + .../legacy/ode/UnknownParameterException.java | 3 ++ .../ClassicalRungeKuttaStepInterpolator.java | 3 ++ .../DormandPrince54StepInterpolator.java | 3 ++ .../DormandPrince853StepInterpolator.java | 2 + .../ode/nonstiff/EulerStepInterpolator.java | 7 ++- .../ode/nonstiff/GillStepInterpolator.java | 4 ++ .../GraggBulirschStoerStepInterpolator.java | 2 + .../HighamHall54StepInterpolator.java | 7 ++- .../ode/nonstiff/LutherStepInterpolator.java | 4 ++ .../nonstiff/MidpointStepInterpolator.java | 7 ++- .../ThreeEighthesStepInterpolator.java | 7 ++- .../sampling/NordsieckStepInterpolator.java | 2 + .../optim/BaseMultivariateOptimizer.java | 7 ++- .../math4/legacy/optim/BaseOptimizer.java | 11 ++-- .../math4/legacy/optim/PointValuePair.java | 3 +- .../legacy/optim/linear/LinearConstraint.java | 3 +- .../optim/linear/LinearObjectiveFunction.java | 3 +- .../legacy/optim/linear/LinearOptimizer.java | 12 ++--- .../linear/NoFeasibleSolutionException.java | 3 ++ .../legacy/optim/linear/SimplexSolver.java | 8 +-- .../legacy/optim/linear/SimplexTableau.java | 3 +- .../linear/UnboundedSolutionException.java | 3 ++ .../scalar/GradientMultivariateOptimizer.java | 4 +- .../scalar/MultivariateOptimizer.java | 11 ++-- .../scalar/noderiv/CMAESOptimizer.java | 12 ++--- .../scalar/noderiv/SimplexOptimizer.java | 16 +++--- .../optim/univariate/UnivariateOptimizer.java | 11 ++-- .../correlation/SpearmansCorrelation.java | 8 +-- .../descriptive/DescriptiveStatistics.java | 4 +- .../descriptive/rank/PSquarePercentile.java | 31 ++++++------ .../ModelSpecificationException.java | 3 ++ .../math4/legacy/util/ComplexFormat.java | 8 +-- .../linalg/FP64FieldDenseMatrixTest.java | 5 +- .../legacy/linear/ArrayFieldVectorTest.java | 3 +- .../legacy/linear/ConjugateGradientTest.java | 22 ++++---- .../math4/legacy/linear/SymmLQTest.java | 18 +++---- .../UnmodifiableRealVectorAbstractTest.java | 32 ++++++------ .../MiniBatchKMeansClustererTest.java | 4 +- .../math4/legacy/ode/nonstiff/Decimal64.java | 7 ++- .../ode/sampling/DummyStepInterpolator.java | 6 ++- .../scalar/noderiv/SimplexOptimizerTest.java | 8 +-- .../math4/legacy/stat/CertifiedDataTest.java | 4 +- .../DescriptiveStatisticsTest.java | 20 ++++---- .../StatisticalSummaryValuesTest.java | 18 ++++--- .../rank/PSquarePercentileTest.java | 7 ++- .../GLSMultipleLinearRegressionTest.java | 2 +- .../internal/NeuralNetException.java | 2 + .../math4/transform/TransformException.java | 2 + .../transform/FastFourierTransformerTest.java | 14 +++--- .../RealTransformerAbstractTest.java | 4 +- pom.xml | 5 +- 129 files changed, 476 insertions(+), 270 deletions(-) diff --git a/commons-math-examples/examples-sofm/tsp/src/main/java/org/apache/commons/math4/examples/sofm/tsp/City.java b/commons-math-examples/examples-sofm/tsp/src/main/java/org/apache/commons/math4/examples/sofm/tsp/City.java index 47ec32d514..787feeb642 100644 --- a/commons-math-examples/examples-sofm/tsp/src/main/java/org/apache/commons/math4/examples/sofm/tsp/City.java +++ b/commons-math-examples/examples-sofm/tsp/src/main/java/org/apache/commons/math4/examples/sofm/tsp/City.java @@ -155,8 +155,7 @@ public static Set unique(City[] cities) { /** {@inheritDoc} */ @Override public boolean equals(Object o) { - if (o instanceof City) { - final City other = (City) o; + if (o instanceof City other) { return x == other.x && y == other.y; } diff --git a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java index f960635aee..98f613ff8f 100644 --- a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java @@ -894,8 +894,7 @@ public boolean isZero() { @Override public boolean equals(final Object other) { - if (other instanceof Dfp) { - final Dfp x = (Dfp) other; + if (other instanceof Dfp x) { if (isNaN() || x.isNaN() || field.getRadixDigits() != x.field.getRadixDigits()) { return false; } diff --git a/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathStrictComparisonTest.java b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathStrictComparisonTest.java index 7714e234f6..421f1f4eda 100644 --- a/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathStrictComparisonTest.java +++ b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathStrictComparisonTest.java @@ -107,8 +107,7 @@ private static void reportFailedResults(Method mathMethod, Object[] params, Obje String format = null; long actL = 0; long expL = 0; - if (expected instanceof Double) { - Double exp = (Double) expected; + if (expected instanceof Double exp) { Double act = (Double) actual; if (isNumber(exp) && isNumber(act) && exp != 0) { // show difference as hex actL = Double.doubleToLongBits(act); @@ -121,8 +120,7 @@ private static void reportFailedResults(Method mathMethod, Object[] params, Obje } format = "%016x"; } - } else if (expected instanceof Float) { - Float exp = (Float) expected; + } else if (expected instanceof Float exp) { Float act = (Float) actual; if (isNumber(exp) && isNumber(act) && exp != 0) { // show difference as hex actL = Float.floatToIntBits(act); @@ -143,13 +141,13 @@ private static void reportFailedResults(Method mathMethod, Object[] params, Obje } sb.append(") expected "); if (format != null) { - sb.append(String.format(format, expL)); + sb.append(format.formatted(expL)); } else { sb.append(expected); } sb.append(" actual "); if (format != null) { - sb.append(String.format(format, actL)); + sb.append(format.formatted(actL)); } else { sb.append(actual); } diff --git a/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathTest.java b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathTest.java index 75aa126d72..451aa8793f 100644 --- a/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathTest.java +++ b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/jdkmath/AccurateMathTest.java @@ -675,11 +675,11 @@ private static void assertAtan2(double y, double x, double numerator, double den if (numerator == 0) { // Exact including the sign. Assertions.assertEquals(numerator, v, - () -> String.format("atan2(%s, %s) should be %s but was %s", y, x, numerator, v)); + () -> "atan2(%s, %s) should be %s but was %s".formatted(y, x, numerator, v)); } else { final double expected = AccurateMath.PI * numerator / denominator; Assertions.assertEquals(expected, v, Precision.EPSILON, - () -> String.format("atan2(%s, %s) should be pi * %s / %s", y, x, numerator, denominator)); + () -> "atan2(%s, %s) should be pi * %s / %s".formatted(y, x, numerator, denominator)); } } diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ConvergenceException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ConvergenceException.java index 8e3966d228..a75fc02a32 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ConvergenceException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ConvergenceException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ */ public class ConvergenceException extends MathIllegalStateException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 4330003017885151975L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/DimensionMismatchException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/DimensionMismatchException.java index ca00fd5a98..15f2d8406e 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/DimensionMismatchException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/DimensionMismatchException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class DimensionMismatchException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -8415396756375798143L; /** Correct dimension. */ private final int dimension; diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/InsufficientDataException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/InsufficientDataException.java index 586727ca73..6890654f91 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/InsufficientDataException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/InsufficientDataException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -28,6 +30,7 @@ public class InsufficientDataException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -2629324471511903359L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathArithmeticException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathArithmeticException.java index 16adb3ee58..42d41af355 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathArithmeticException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathArithmeticException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -29,6 +31,7 @@ */ public class MathArithmeticException extends MathRuntimeException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalArgumentException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalArgumentException.java index 80873cefa2..b7ea2f7b3d 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalArgumentException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalArgumentException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; /** @@ -28,6 +30,7 @@ */ public class MathIllegalArgumentException extends MathRuntimeException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalNumberException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalNumberException.java index 387ca43238..13e7cf6905 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalNumberException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalNumberException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; /** @@ -32,6 +34,7 @@ public class MathIllegalNumberException extends MathIllegalArgumentException { protected static final Integer INTEGER_ZERO = Integer.valueOf(0); /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -7447085893598031110L; /** Requested. */ diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalStateException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalStateException.java index b66d2e9b1d..82816207f6 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalStateException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathIllegalStateException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -28,6 +30,7 @@ */ public class MathIllegalStateException extends MathRuntimeException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathInternalError.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathInternalError.java index c719617959..373cff5392 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathInternalError.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathInternalError.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class MathInternalError extends MathIllegalStateException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6276776513966934846L; /** URL for reporting problems. */ private static final String REPORT_URL = "https://issues.apache.org/jira/browse/MATH"; diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathParseException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathParseException.java index 29e56f6f0e..a05e99beb6 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathParseException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathParseException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; /** @@ -25,6 +27,7 @@ */ public class MathParseException extends MathIllegalStateException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathRuntimeException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathRuntimeException.java index 7c076b659e..27fea6a6bc 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathRuntimeException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathRuntimeException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.ExceptionContext; import org.apache.commons.math4.legacy.exception.util.ExceptionContextProvider; import org.apache.commons.math4.legacy.exception.util.Localizable; @@ -32,6 +34,7 @@ public class MathRuntimeException extends RuntimeException implements ExceptionContextProvider { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20120926L; /** Context. */ private final ExceptionContext context; diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathUnsupportedOperationException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathUnsupportedOperationException.java index c2de5af160..e343763f7f 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathUnsupportedOperationException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MathUnsupportedOperationException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -29,6 +31,7 @@ */ public class MathUnsupportedOperationException extends MathRuntimeException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MaxCountExceededException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MaxCountExceededException.java index ee463726b9..9927016aef 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MaxCountExceededException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MaxCountExceededException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class MaxCountExceededException extends MathIllegalStateException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 4330003017885151975L; /** * Maximum number of evaluations. diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MultiDimensionMismatchException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MultiDimensionMismatchException.java index 8025b757f0..cee5cbf9dd 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MultiDimensionMismatchException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/MultiDimensionMismatchException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class MultiDimensionMismatchException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -8415396756375798143L; /** Wrong dimensions. */ diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoBracketingException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoBracketingException.java index 5b28e42fb4..287d47ebd6 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoBracketingException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoBracketingException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ */ public class NoBracketingException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -3629324471511904459L; /** Lower end of the interval. */ private final double lo; diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoDataException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoDataException.java index 7c3385eef8..0b9f6c8e92 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoDataException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NoDataException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ public class NoDataException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -3629324471511904459L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NonMonotonicSequenceException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NonMonotonicSequenceException.java index 205c24dc59..2b0a3af6d7 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NonMonotonicSequenceException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NonMonotonicSequenceException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; /** @@ -26,6 +28,7 @@ */ public class NonMonotonicSequenceException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20210531L; /** * Whether the sequence should be increasing. diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotANumberException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotANumberException.java index 307e9f1e08..3e8a5dc58c 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotANumberException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotANumberException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; /** @@ -25,6 +27,7 @@ */ public class NotANumberException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20120906L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotFiniteNumberException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotFiniteNumberException.java index 1930919c6f..d071eb7dd9 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotFiniteNumberException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotFiniteNumberException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NotFiniteNumberException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6100997100383932834L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotPositiveException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotPositiveException.java index a3a9691e21..326645c182 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotPositiveException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotPositiveException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; /** @@ -25,6 +27,7 @@ */ public class NotPositiveException extends NumberIsTooSmallException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -2250556892093726375L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotStrictlyPositiveException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotStrictlyPositiveException.java index 5608360958..c925868684 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotStrictlyPositiveException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NotStrictlyPositiveException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; /** @@ -26,6 +28,7 @@ public class NotStrictlyPositiveException extends NumberIsTooSmallException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -7824848630829852237L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NullArgumentException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NullArgumentException.java index ec371bb20a..62f5ee4315 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NullArgumentException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NullArgumentException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.ExceptionContext; import org.apache.commons.math4.legacy.exception.util.ExceptionContextProvider; import org.apache.commons.math4.legacy.exception.util.Localizable; @@ -38,6 +40,7 @@ public class NullArgumentException extends NullPointerException implements ExceptionContextProvider { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20150225L; /** Context. */ diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooLargeException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooLargeException.java index 486269748d..ff283c1ee8 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooLargeException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooLargeException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NumberIsTooLargeException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 4330003017885151975L; /** * Higher bound. diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooSmallException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooSmallException.java index e130f0f4a3..3b3ad68a9a 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooSmallException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/NumberIsTooSmallException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NumberIsTooSmallException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6100997100383932834L; /** * Higher bound. diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/OutOfRangeException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/OutOfRangeException.java index 3bab569273..61997526bc 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/OutOfRangeException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/OutOfRangeException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class OutOfRangeException extends MathIllegalNumberException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 111601815794403609L; /** Lower bound. */ private final Number lo; diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyEvaluationsException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyEvaluationsException.java index ffb760eeea..3f36c7f780 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyEvaluationsException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyEvaluationsException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; /** @@ -25,6 +27,7 @@ */ public class TooManyEvaluationsException extends MaxCountExceededException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 4330003017885151975L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyIterationsException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyIterationsException.java index 599ffa31c1..7052630393 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyIterationsException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/TooManyIterationsException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; /** @@ -25,6 +27,7 @@ */ public class TooManyIterationsException extends MaxCountExceededException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20121211L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ZeroException.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ZeroException.java index 88ebee4760..51d5203fc8 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ZeroException.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/ZeroException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.exception; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.util.Localizable; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ public class ZeroException extends MathIllegalNumberException { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -1960874856936000015L; /** diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ArgUtils.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ArgUtils.java index 98fa9014d2..628ec07e1b 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ArgUtils.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ArgUtils.java @@ -41,8 +41,8 @@ public static Object[] flatten(Object[] array) { final List list = new ArrayList<>(); if (array != null) { for (Object o : array) { - if (o instanceof Object[]) { - list.addAll(Arrays.asList(flatten((Object[]) o))); + if (o instanceof Object[] objects) { + list.addAll(Arrays.asList(flatten(objects))); } else { list.add(o); } diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/DummyLocalizable.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/DummyLocalizable.java index d32e131ab0..ff9547d7b0 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/DummyLocalizable.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/DummyLocalizable.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.exception.util; +import java.io.Serial; import java.util.Locale; /** @@ -26,6 +27,7 @@ public class DummyLocalizable implements Localizable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 8843275624471387299L; /** Source string. */ diff --git a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ExceptionContext.java b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ExceptionContext.java index 89725c7524..86923613c7 100644 --- a/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ExceptionContext.java +++ b/commons-math-legacy-exception/src/main/java/org/apache/commons/math4/legacy/exception/util/ExceptionContext.java @@ -21,6 +21,7 @@ import java.util.Set; import java.util.Map; import java.io.IOException; +import java.io.Serial; import java.io.Serializable; import java.io.ObjectOutputStream; import java.io.ObjectInputStream; @@ -37,6 +38,7 @@ */ public class ExceptionContext implements Serializable { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -6024911025449780478L; /** * The throwable to which this context refers to. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java index a6033ee49b..51b68cbe10 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/DerivativeStructure.java @@ -1138,8 +1138,7 @@ public boolean equals(Object other) { return true; } - if (other instanceof DerivativeStructure) { - final DerivativeStructure rhs = (DerivativeStructure)other; + if (other instanceof DerivativeStructure rhs) { return getFreeParameters() == rhs.getFreeParameters() && getOrder() == rhs.getOrder() && MathArrays.equals(data, rhs.data); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/SparseGradient.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/SparseGradient.java index bb46867850..7283ad0cc9 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/SparseGradient.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/differentiation/SparseGradient.java @@ -884,8 +884,7 @@ public boolean equals(Object other) { return true; } - if (other instanceof SparseGradient) { - final SparseGradient rhs = (SparseGradient)other; + if (other instanceof SparseGradient rhs) { if (!Precision.equals(value, rhs.value, 1)) { return false; } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java index 35920338e3..02d19206d4 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java @@ -430,8 +430,8 @@ public boolean equals(Object other) { return true; } - if (other instanceof DataRow) { - return MathArrays.equals(row, ((DataRow) other).row); + if (other instanceof DataRow dataRow) { + return MathArrays.equals(row, dataRow.row); } return false; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/field/linalg/FieldDenseMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/field/linalg/FieldDenseMatrix.java index 8db234cdfa..d6737065be 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/field/linalg/FieldDenseMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/field/linalg/FieldDenseMatrix.java @@ -125,8 +125,7 @@ public boolean equals(Object other) { if (this == other) { return true; } else { - if (other instanceof FieldDenseMatrix) { - final FieldDenseMatrix m = (FieldDenseMatrix) other; + if (other instanceof FieldDenseMatrix m) { return field.equals(m.field) && rows == m.rows && columns == m.columns && diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/AbstractListChromosome.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/AbstractListChromosome.java index 5b86416c3a..2daa35b522 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/AbstractListChromosome.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/AbstractListChromosome.java @@ -101,6 +101,6 @@ public int getLength() { /** {@inheritDoc} */ @Override public String toString() { - return String.format("(f=%s %s)", getFitness(), getRepresentation()); + return "(f=%s %s)".formatted(getFitness(), getRepresentation()); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/ChromosomePair.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/ChromosomePair.java index c07bffbd0c..fc4e9d8590 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/ChromosomePair.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/ChromosomePair.java @@ -61,6 +61,6 @@ public Chromosome getSecond() { /** {@inheritDoc} */ @Override public String toString() { - return String.format("(%s,%s)", getFirst(), getSecond()); + return "(%s,%s)".formatted(getFirst(), getSecond()); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/InvalidRepresentationException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/InvalidRepresentationException.java index 60a28e35dc..9f4ce39c54 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/InvalidRepresentationException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/InvalidRepresentationException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.genetics; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.Localizable; @@ -27,6 +29,7 @@ public class InvalidRepresentationException extends MathIllegalArgumentException { /** Serialization version id. */ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/RandomKey.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/RandomKey.java index 4ccd2ee818..ed1bfcfc4a 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/RandomKey.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/genetics/RandomKey.java @@ -281,7 +281,7 @@ public static List inducedPermutation(final List originalData, /** {@inheritDoc} */ @Override public String toString() { - return String.format("(f=%s pi=(%s))", getFitness(), baseSeqPermutation); + return "(f=%s pi=(%s))".formatted(getFitness(), baseSeqPermutation); } /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/AbstractRealMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/AbstractRealMatrix.java index 9c074685e6..3ce07b8648 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/AbstractRealMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/AbstractRealMatrix.java @@ -695,8 +695,8 @@ public double[] operate(final double[] v) @Override public RealVector operate(final RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - return new ArrayRealVector(operate(((ArrayRealVector) v).getDataRef()), false); + if (v instanceof ArrayRealVector vector) { + return new ArrayRealVector(operate(vector.getDataRef()), false); } final int nRows = getRowDimension(); @@ -742,8 +742,8 @@ public double[] preMultiply(final double[] v) throws DimensionMismatchException /** {@inheritDoc} */ @Override public RealVector preMultiply(final RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - return new ArrayRealVector(preMultiply(((ArrayRealVector) v).getDataRef()), false); + if (v instanceof ArrayRealVector vector) { + return new ArrayRealVector(preMultiply(vector.getDataRef()), false); } final int nRows = getRowDimension(); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowFieldMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowFieldMatrix.java index d10d82ed95..082bf1a955 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowFieldMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowFieldMatrix.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.core.Field; @@ -45,6 +46,7 @@ public class Array2DRowFieldMatrix> extends AbstractFieldMatrix implements Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 7260756672015356458L; /** Entries of the matrix. */ private T[][] data; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowRealMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowRealMatrix.java index 69992adadf..56319fafb7 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowRealMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/Array2DRowRealMatrix.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -31,6 +32,7 @@ */ public class Array2DRowRealMatrix extends AbstractRealMatrix implements Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -1067294169172445528L; /** Entries of the matrix. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayFieldVector.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayFieldVector.java index d7c5f6d8f0..01e654e17d 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayFieldVector.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayFieldVector.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; @@ -39,6 +40,7 @@ */ public class ArrayFieldVector> implements FieldVector, Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 7648186910365927050L; /** Entries of the vector. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayRealVector.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayRealVector.java index 3df56b0551..fadead111f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayRealVector.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/ArrayRealVector.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Iterator; @@ -36,6 +37,7 @@ */ public class ArrayRealVector extends RealVector implements Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -1097961340710804027L; /** Default format. */ private static final RealVectorFormat DEFAULT_FORMAT = RealVectorFormat.getInstance(); @@ -291,8 +293,8 @@ public ArrayRealVector copy() { @Override public ArrayRealVector add(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; final int dim = vData.length; checkVectorDimensions(dim); ArrayRealVector result = new ArrayRealVector(dim); @@ -317,8 +319,8 @@ public ArrayRealVector add(RealVector v) @Override public ArrayRealVector subtract(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; final int dim = vData.length; checkVectorDimensions(dim); ArrayRealVector result = new ArrayRealVector(dim); @@ -394,8 +396,8 @@ public RealVector mapDivideToSelf(double d) { @Override public ArrayRealVector ebeMultiply(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; final int dim = vData.length; checkVectorDimensions(dim); ArrayRealVector result = new ArrayRealVector(dim); @@ -418,8 +420,8 @@ public ArrayRealVector ebeMultiply(RealVector v) @Override public ArrayRealVector ebeDivide(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; final int dim = vData.length; checkVectorDimensions(dim); ArrayRealVector result = new ArrayRealVector(dim); @@ -451,8 +453,8 @@ public double[] getDataRef() { /** {@inheritDoc} */ @Override public double dotProduct(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; checkVectorDimensions(vData.length); double dot = 0; for (int i = 0; i < data.length; i++) { @@ -496,8 +498,8 @@ public double getLInfNorm() { /** {@inheritDoc} */ @Override public double getDistance(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; checkVectorDimensions(vData.length); double sum = 0; for (int i = 0; i < data.length; ++i) { @@ -520,8 +522,8 @@ public double getDistance(RealVector v) throws DimensionMismatchException { @Override public double getL1Distance(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; checkVectorDimensions(vData.length); double sum = 0; for (int i = 0; i < data.length; ++i) { @@ -544,8 +546,8 @@ public double getL1Distance(RealVector v) @Override public double getLInfDistance(RealVector v) throws DimensionMismatchException { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; checkVectorDimensions(vData.length); double max = 0; for (int i = 0; i < data.length; ++i) { @@ -567,8 +569,8 @@ public double getLInfDistance(RealVector v) /** {@inheritDoc} */ @Override public RealMatrix outerProduct(RealVector v) { - if (v instanceof ArrayRealVector) { - final double[] vData = ((ArrayRealVector) v).data; + if (v instanceof ArrayRealVector vector) { + final double[] vData = vector.data; final int m = data.length; final int n = vData.length; final RealMatrix out = MatrixUtils.createRealMatrix(m, n); @@ -611,8 +613,8 @@ public int getDimension() { /** {@inheritDoc} */ @Override public RealVector append(RealVector v) { - if (v instanceof ArrayRealVector) { - return new ArrayRealVector(this, (ArrayRealVector) v); + if (v instanceof ArrayRealVector vector) { + return new ArrayRealVector(this, vector); } return new ArrayRealVector(this, v); } @@ -679,8 +681,8 @@ public void addToEntry(int index, double increment) @Override public void setSubVector(int index, RealVector v) throws OutOfRangeException { - if (v instanceof ArrayRealVector) { - setSubVector(index, ((ArrayRealVector) v).data); + if (v instanceof ArrayRealVector vector) { + setSubVector(index, vector.data); } else { try { for (int i = index; i < index + v.getDimension(); ++i) { @@ -845,8 +847,8 @@ public ArrayRealVector combine(double a, double b, RealVector y) @Override public ArrayRealVector combineToSelf(double a, double b, RealVector y) throws DimensionMismatchException { - if (y instanceof ArrayRealVector) { - final double[] yData = ((ArrayRealVector) y).data; + if (y instanceof ArrayRealVector vector) { + final double[] yData = vector.data; checkVectorDimensions(yData.length); for (int i = 0; i < this.data.length; i++) { data[i] = a * data[i] + b * yData[i]; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigReal.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigReal.java index 6450e56a2b..81606a59ab 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigReal.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigReal.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; @@ -45,6 +46,7 @@ public class BigReal implements FieldElement, Comparable, Seri public static final BigReal ONE = new BigReal(BigDecimal.ONE); /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 4984534880991310382L; /** Underlying BigDecimal. */ @@ -314,8 +316,8 @@ public boolean equals(Object other) { return true; } - if (other instanceof BigReal) { - return d.compareTo(((BigReal) other).d) == 0; + if (other instanceof BigReal real) { + return d.compareTo(real.d) == 0; } return false; } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigRealField.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigRealField.java index 63cab60a05..59bc2478b6 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigRealField.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BigRealField.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.core.Field; @@ -33,6 +34,7 @@ public final class BigRealField implements Field, Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 4756431066541037559L; /** Private constructor for the singleton. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockFieldMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockFieldMatrix.java index d13a57eb28..76330f86c5 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockFieldMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockFieldMatrix.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.core.Field; @@ -74,6 +75,7 @@ public class BlockFieldMatrix> extends AbstractFieldMa /** Block size. */ public static final int BLOCK_SIZE = 36; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -4602336630143123183L; /** Blocks of matrix entries. */ private final T[][] blocks; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockRealMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockRealMatrix.java index d176db670a..4b37883f98 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockRealMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/BlockRealMatrix.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; @@ -71,6 +72,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable /** Block size. */ public static final int BLOCK_SIZE = 52; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 4991895511313664478L; /** Blocks of matrix entries. */ private final double[][] blocks; @@ -299,8 +301,8 @@ public BlockRealMatrix copy() { @Override public BlockRealMatrix add(final RealMatrix m) throws MatrixDimensionMismatchException { - if (m instanceof BlockRealMatrix) { - return add((BlockRealMatrix) m); + if (m instanceof BlockRealMatrix matrix) { + return add(matrix); } // safety check @@ -367,8 +369,8 @@ public BlockRealMatrix add(final BlockRealMatrix m) @Override public BlockRealMatrix subtract(final RealMatrix m) throws MatrixDimensionMismatchException { - if (m instanceof BlockRealMatrix) { - return subtract((BlockRealMatrix) m); + if (m instanceof BlockRealMatrix matrix) { + return subtract(matrix); } // safety check @@ -470,8 +472,8 @@ public RealMatrix scalarMultiply(final double d) { @Override public BlockRealMatrix multiply(final RealMatrix m) throws DimensionMismatchException { - if (m instanceof BlockRealMatrix) { - return multiply((BlockRealMatrix) m); + if (m instanceof BlockRealMatrix matrix) { + return multiply(matrix); } // safety check @@ -868,8 +870,8 @@ public BlockRealMatrix getRowMatrix(final int row) @Override public void setRowMatrix(final int row, final RealMatrix matrix) throws OutOfRangeException, MatrixDimensionMismatchException { - if (matrix instanceof BlockRealMatrix) { - setRowMatrix(row, (BlockRealMatrix) matrix); + if (matrix instanceof BlockRealMatrix realMatrix) { + setRowMatrix(row, realMatrix); } else { super.setRowMatrix(row, matrix); } @@ -952,8 +954,8 @@ public BlockRealMatrix getColumnMatrix(final int column) @Override public void setColumnMatrix(final int column, final RealMatrix matrix) throws OutOfRangeException, MatrixDimensionMismatchException { - if (matrix instanceof BlockRealMatrix) { - setColumnMatrix(column, (BlockRealMatrix) matrix); + if (matrix instanceof BlockRealMatrix realMatrix) { + setColumnMatrix(column, realMatrix); } else { super.setColumnMatrix(column, matrix); } @@ -1026,8 +1028,8 @@ public RealVector getRowVector(final int row) @Override public void setRowVector(final int row, final RealVector vector) throws OutOfRangeException, MatrixDimensionMismatchException { - if (vector instanceof ArrayRealVector) { - setRow(row, ((ArrayRealVector) vector).getDataRef()); + if (vector instanceof ArrayRealVector realVector) { + setRow(row, realVector.getDataRef()); } else { super.setRowVector(row, vector); } @@ -1060,8 +1062,8 @@ public RealVector getColumnVector(final int column) @Override public void setColumnVector(final int column, final RealVector vector) throws OutOfRangeException, MatrixDimensionMismatchException { - if (vector instanceof ArrayRealVector) { - setColumn(column, ((ArrayRealVector) vector).getDataRef()); + if (vector instanceof ArrayRealVector realVector) { + setColumn(column, realVector.getDataRef()); } else { super.setColumnVector(column, vector); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DefaultIterativeLinearSolverEvent.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DefaultIterativeLinearSolverEvent.java index c4f988e11e..2b64361f3f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DefaultIterativeLinearSolverEvent.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DefaultIterativeLinearSolverEvent.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathUnsupportedOperationException; /** @@ -26,6 +28,7 @@ public class DefaultIterativeLinearSolverEvent extends IterativeLinearSolverEvent { /** */ + @Serial private static final long serialVersionUID = 20120129L; /** The right-hand side vector. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DiagonalMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DiagonalMatrix.java index ee705c825c..880a9120f1 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DiagonalMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/DiagonalMatrix.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -34,6 +35,7 @@ public class DiagonalMatrix extends AbstractRealMatrix implements Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20121229L; /** Entries of the diagonal. */ private final double[] data; @@ -180,8 +182,8 @@ public DiagonalMatrix multiply(final DiagonalMatrix m) @Override public RealMatrix multiply(final RealMatrix m) throws DimensionMismatchException { - if (m instanceof DiagonalMatrix) { - return multiply((DiagonalMatrix) m); + if (m instanceof DiagonalMatrix matrix) { + return multiply(matrix); } else { MatrixUtils.checkMultiplicationCompatible(this, m); final int nRows = m.getRowDimension(); @@ -299,8 +301,8 @@ public double[] preMultiply(final double[] v) @Override public RealVector preMultiply(final RealVector v) throws DimensionMismatchException { final double[] vectorData; - if (v instanceof ArrayRealVector) { - vectorData = ((ArrayRealVector) v).getDataRef(); + if (v instanceof ArrayRealVector vector) { + vectorData = vector.getDataRef(); } else { vectorData = v.toArray(); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IllConditionedOperatorException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IllConditionedOperatorException.java index bd70c0b24e..bf1d2d64f9 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IllConditionedOperatorException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IllConditionedOperatorException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -28,6 +30,7 @@ public class IllConditionedOperatorException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -7883263944530490135L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationEvent.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationEvent.java index 2812ee4da0..06597cda6d 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationEvent.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationEvent.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.util.EventObject; /** @@ -25,6 +26,7 @@ */ public class IterationEvent extends EventObject { /** */ + @Serial private static final long serialVersionUID = 20120128L; /** The number of iterations performed so far. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolverEvent.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolverEvent.java index acaa7bc550..e7d4d4dbf6 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolverEvent.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolverEvent.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathUnsupportedOperationException; /** @@ -27,6 +29,7 @@ public abstract class IterativeLinearSolverEvent extends IterationEvent { /** Serialization identifier. */ + @Serial private static final long serialVersionUID = 20120129L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/JacobiPreconditioner.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/JacobiPreconditioner.java index 0752b3f576..f007238a03 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/JacobiPreconditioner.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/JacobiPreconditioner.java @@ -63,8 +63,7 @@ public static JacobiPreconditioner create(final RealLinearOperator a) throw new NonSquareOperatorException(a.getRowDimension(), n); } final double[] diag = new double[n]; - if (a instanceof AbstractRealMatrix) { - final AbstractRealMatrix m = (AbstractRealMatrix) a; + if (a instanceof AbstractRealMatrix m) { for (int i = 0; i < n; i++) { diag[i] = m.getEntry(i, i); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixDimensionMismatchException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixDimensionMismatchException.java index 7282785c0a..dac6f3c7c0 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixDimensionMismatchException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixDimensionMismatchException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MultiDimensionMismatchException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ */ public class MatrixDimensionMismatchException extends MultiDimensionMismatchException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -8415396756375798143L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixUtils.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixUtils.java index 24615e24e2..733abd1a64 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixUtils.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/MatrixUtils.java @@ -1000,8 +1000,8 @@ public static RealMatrix inverse(RealMatrix matrix, double threshold) matrix.getColumnDimension()); } - if (matrix instanceof DiagonalMatrix) { - return ((DiagonalMatrix) matrix).inverse(threshold); + if (matrix instanceof DiagonalMatrix diagonalMatrix) { + return diagonalMatrix.inverse(threshold); } else { QRDecomposition decomposition = new QRDecomposition(matrix, threshold); return decomposition.getSolver().getInverse(); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteMatrixException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteMatrixException.java index 9254b62d73..5cfb6c8b50 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteMatrixException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteMatrixException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.NumberIsTooSmallException; import org.apache.commons.math4.legacy.exception.util.ExceptionContext; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ */ public class NonPositiveDefiniteMatrixException extends NumberIsTooSmallException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 1641613838113738061L; /** Index (diagonal element). */ private final int index; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteOperatorException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteOperatorException.java index 035c271da4..9599290eb2 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteOperatorException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonPositiveDefiniteOperatorException.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -34,6 +36,7 @@ public class NonPositiveDefiniteOperatorException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 917034489420549847L; /** Creates a new instance of this class. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSelfAdjointOperatorException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSelfAdjointOperatorException.java index bb4727bf0e..811007f3d5 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSelfAdjointOperatorException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSelfAdjointOperatorException.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -37,6 +39,7 @@ public class NonSelfAdjointOperatorException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 1784999305030258247L; /** Creates a new instance of this class. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareMatrixException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareMatrixException.java index 3e09f548b9..b87a825044 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareMatrixException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareMatrixException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NonSquareMatrixException extends DimensionMismatchException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -660069396594485772L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareOperatorException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareOperatorException.java index 14e14234a2..1ac888e700 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareOperatorException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSquareOperatorException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NonSquareOperatorException extends DimensionMismatchException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -4145007524150846242L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSymmetricMatrixException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSymmetricMatrixException.java index 39ed9dc266..ababa06e30 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSymmetricMatrixException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/NonSymmetricMatrixException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NonSymmetricMatrixException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -7518495577824189882L; /** Row. */ private final int row; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToDoubleHashMap.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToDoubleHashMap.java index 5ab2ae3951..d63dc91849 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToDoubleHashMap.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToDoubleHashMap.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.ConcurrentModificationException; import java.util.NoSuchElementException; @@ -47,6 +48,7 @@ class OpenIntToDoubleHashMap implements Serializable { // Not in public API. protected static final byte REMOVED = 2; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -3646337053166149105L; /** Load factor for the map. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToFieldHashMap.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToFieldHashMap.java index 35404c95e8..73268f3c4b 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToFieldHashMap.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenIntToFieldHashMap.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Array; import java.util.ConcurrentModificationException; @@ -50,6 +51,7 @@ class OpenIntToFieldHashMap> implements Serializable { protected static final byte REMOVED = 2; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -9179080286849120720L; /** Load factor for the map. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealMatrix.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealMatrix.java index b30151c9fb..e4511b786d 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealMatrix.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealMatrix.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -39,6 +40,7 @@ public class OpenMapRealMatrix extends AbstractRealMatrix implements SparseRealMatrix, Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -5962461716457143437L; /** Number of rows of the matrix. */ private final int rows; @@ -133,8 +135,8 @@ public OpenMapRealMatrix add(OpenMapRealMatrix m) @Override public OpenMapRealMatrix subtract(final RealMatrix m) throws MatrixDimensionMismatchException { - if (m instanceof OpenMapRealMatrix) { - return subtract((OpenMapRealMatrix) m); + if (m instanceof OpenMapRealMatrix matrix) { + return subtract(matrix); } return (OpenMapRealMatrix) super.subtract(m); } @@ -172,8 +174,8 @@ public OpenMapRealMatrix subtract(OpenMapRealMatrix m) @Override public RealMatrix multiply(final RealMatrix m) throws DimensionMismatchException, NumberIsTooLargeException { - if (m instanceof OpenMapRealMatrix) { - return multiply((OpenMapRealMatrix) m); + if (m instanceof OpenMapRealMatrix matrix) { + return multiply(matrix); } MatrixUtils.checkMultiplicationCompatible(this, m); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealVector.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealVector.java index 449a61db10..5aec7aeefd 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealVector.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/OpenMapRealVector.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -44,6 +45,7 @@ public class OpenMapRealVector extends SparseRealVector /** Default Tolerance for having a value considered zero. */ public static final double DEFAULT_ZERO_TOLERANCE = 1.0e-12; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 8772222695580707260L; /** Entries of the vector. */ private final OpenIntToDoubleHashMap entries; @@ -233,8 +235,8 @@ protected boolean isDefaultValue(double value) { public RealVector add(RealVector v) throws DimensionMismatchException { checkVectorDimensions(v.getDimension()); - if (v instanceof OpenMapRealVector) { - return add((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return add(vector); } else { return super.add(v); } @@ -285,8 +287,8 @@ public OpenMapRealVector append(OpenMapRealVector v) { /** {@inheritDoc} */ @Override public OpenMapRealVector append(RealVector v) { - if (v instanceof OpenMapRealVector) { - return append((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return append(vector); } else { final OpenMapRealVector res = new OpenMapRealVector(this, v.getDimension()); for (int i = 0; i < v.getDimension(); i++) { @@ -408,8 +410,8 @@ public double getDistance(OpenMapRealVector v) @Override public double getDistance(RealVector v) throws DimensionMismatchException { checkVectorDimensions(v.getDimension()); - if (v instanceof OpenMapRealVector) { - return getDistance((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return getDistance(vector); } else { return super.getDistance(v); } @@ -459,8 +461,8 @@ public double getL1Distance(OpenMapRealVector v) public double getL1Distance(RealVector v) throws DimensionMismatchException { checkVectorDimensions(v.getDimension()); - if (v instanceof OpenMapRealVector) { - return getL1Distance((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return getL1Distance(vector); } else { return super.getL1Distance(v); } @@ -501,8 +503,8 @@ private double getLInfDistance(OpenMapRealVector v) public double getLInfDistance(RealVector v) throws DimensionMismatchException { checkVectorDimensions(v.getDimension()); - if (v instanceof OpenMapRealVector) { - return getLInfDistance((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return getLInfDistance(vector); } else { return super.getLInfDistance(v); } @@ -614,8 +616,8 @@ public OpenMapRealVector subtract(OpenMapRealVector v) public RealVector subtract(RealVector v) throws DimensionMismatchException { checkVectorDimensions(v.getDimension()); - if (v instanceof OpenMapRealVector) { - return subtract((OpenMapRealVector) v); + if (v instanceof OpenMapRealVector vector) { + return subtract(vector); } else { return super.subtract(v); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularMatrixException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularMatrixException.java index 6773efa100..7cb04da508 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularMatrixException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularMatrixException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class SingularMatrixException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -4206514844735401070L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularOperatorException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularOperatorException.java index 9bee5546f2..557531e962 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularOperatorException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SingularOperatorException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ public class SingularOperatorException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = -476049978595245033L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SparseFieldVector.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SparseFieldVector.java index 8c0516437e..c09af03d4f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SparseFieldVector.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SparseFieldVector.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.core.Field; @@ -43,6 +44,7 @@ */ public class SparseFieldVector> implements FieldVector, Serializable { /** Serialization identifier. */ + @Serial private static final long serialVersionUID = 7841233292190413362L; /** Field to which the elements belong. */ private final Field field; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ContinuousOutputModel.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ContinuousOutputModel.java index 9287e983d9..22918cdedb 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ContinuousOutputModel.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ContinuousOutputModel.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.ode; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -90,6 +91,7 @@ public class ContinuousOutputModel implements StepHandler, Serializable { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -1417964919405031606L; /** Initial integration time. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/EquationsMapper.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/EquationsMapper.java index c5ea6a7578..6f0a32f9f4 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/EquationsMapper.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/EquationsMapper.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.ode; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -33,6 +34,7 @@ public class EquationsMapper implements Serializable { /** Serializable UID. */ + @Serial private static final long serialVersionUID = 20110925L; /** Index of the first equation element in complete state arrays. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/FieldEquationsMapper.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/FieldEquationsMapper.java index 849d057b5c..6dcf8a9454 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/FieldEquationsMapper.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/FieldEquationsMapper.java @@ -17,6 +17,7 @@ package org.apache.commons.math4.legacy.ode; +import java.io.Serial; import java.io.Serializable; import org.apache.commons.math4.legacy.core.RealFieldElement; @@ -38,6 +39,7 @@ public class FieldEquationsMapper> implements Serializable { /** Serializable UID. */ + @Serial private static final long serialVersionUID = 20151114L; /** Start indices of the components. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/JacobianMatrices.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/JacobianMatrices.java index 9fd86870ef..3c16ae1d4d 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/JacobianMatrices.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/JacobianMatrices.java @@ -162,8 +162,8 @@ public void registerVariationalEquations(final ExpandableStatefulODE expandable) throws DimensionMismatchException, MismatchedEquations { // safety checks - final FirstOrderDifferentialEquations ode = (jode instanceof MainStateJacobianWrapper) ? - ((MainStateJacobianWrapper) jode).ode : + final FirstOrderDifferentialEquations ode = (jode instanceof MainStateJacobianWrapper msjw) ? + msjw.ode : jode; if (expandable.getPrimary() != ode) { throw new MismatchedEquations(); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/MultistepIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/MultistepIntegrator.java index 27caaefbc2..5910d5bdad 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/MultistepIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/MultistepIntegrator.java @@ -227,8 +227,8 @@ protected void start(final double t0, final double[] y0, final double t) // start integration, expecting a InitializationCompletedMarkerException try { - if (starter instanceof AbstractIntegrator) { - ((AbstractIntegrator) starter).integrate(getExpandable(), t); + if (starter instanceof AbstractIntegrator integrator) { + integrator.integrate(getExpandable(), t); } else { starter.integrate(new FirstOrderDifferentialEquations() { diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ParameterConfiguration.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ParameterConfiguration.java index 688dac9a34..86afa19e02 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ParameterConfiguration.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/ParameterConfiguration.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.legacy.ode; +import java.io.Serial; import java.io.Serializable; /** Simple container pairing a parameter name with a step in order to compute @@ -26,6 +27,7 @@ class ParameterConfiguration implements Serializable { /** Serializable UID. */ + @Serial private static final long serialVersionUID = 2247518849090889379L; /** Parameter name. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/UnknownParameterException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/UnknownParameterException.java index 7bb34ed3bb..b61cf14b63 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/UnknownParameterException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/UnknownParameterException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.ode; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -27,6 +29,7 @@ public class UnknownParameterException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 20120902L; /** Parameter name. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java index a7f95cb1f8..6936b93793 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; /** @@ -55,6 +57,7 @@ class ClassicalRungeKuttaStepInterpolator extends RungeKuttaStepInterpolator { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20111120L; /** Simple constructor. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince54StepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince54StepInterpolator.java index 9bad2e2ef3..cacef90620 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince54StepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince54StepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.AbstractIntegrator; import org.apache.commons.math4.legacy.ode.EquationsMapper; import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; @@ -71,6 +73,7 @@ class DormandPrince54StepInterpolator private static final double D6 = 69997945.0 / 29380423.0; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20111120L; /** First vector for interpolation. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince853StepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince853StepInterpolator.java index d4b5af45d8..44c9e42f40 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince853StepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/DormandPrince853StepInterpolator.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.ode.AbstractIntegrator; @@ -39,6 +40,7 @@ class DormandPrince853StepInterpolator extends RungeKuttaStepInterpolator { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20111120L; /** Propagation weights, element 1. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/EulerStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/EulerStepInterpolator.java index cb004408b7..342b07de7c 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/EulerStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/EulerStepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; /** @@ -44,8 +46,9 @@ class EulerStepInterpolator extends RungeKuttaStepInterpolator { - /** Serializable version identifier. */ - private static final long serialVersionUID = 20111120L; + /** Serializable version identifier. */ + @Serial + private static final long serialVersionUID = 20111120L; /** Simple constructor. * This constructor builds an instance that is not usable yet, the diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GillStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GillStepInterpolator.java index 0c14d565d0..c8efa947d5 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GillStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GillStepInterpolator.java @@ -18,8 +18,11 @@ package org.apache.commons.math4.legacy.ode.nonstiff; import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; + import org.apache.commons.math4.core.jdkmath.JdkMath; +import java.io.Serial; + /** * This class implements a step interpolator for the Gill fourth * order Runge-Kutta integrator. @@ -61,6 +64,7 @@ class GillStepInterpolator private static final double ONE_PLUS_INV_SQRT_2 = 1 + JdkMath.sqrt(0.5); /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20111120L; /** Simple constructor. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GraggBulirschStoerStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GraggBulirschStoerStepInterpolator.java index 8d55fd33f5..c3bd67e303 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GraggBulirschStoerStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/GraggBulirschStoerStepInterpolator.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import org.apache.commons.math4.legacy.ode.EquationsMapper; import org.apache.commons.math4.legacy.ode.sampling.AbstractStepInterpolator; @@ -78,6 +79,7 @@ class GraggBulirschStoerStepInterpolator extends AbstractStepInterpolator { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20110928L; /** Slope at the beginning of the step. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/HighamHall54StepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/HighamHall54StepInterpolator.java index b633958d6f..086a180bdf 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/HighamHall54StepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/HighamHall54StepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; /** @@ -31,8 +33,9 @@ class HighamHall54StepInterpolator extends RungeKuttaStepInterpolator { - /** Serializable version identifier. */ - private static final long serialVersionUID = 20111120L; + /** Serializable version identifier. */ + @Serial + private static final long serialVersionUID = 20111120L; /** Simple constructor. * This constructor builds an instance that is not usable yet, the diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/LutherStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/LutherStepInterpolator.java index c081b4bf7c..b80b5e42f6 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/LutherStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/LutherStepInterpolator.java @@ -18,8 +18,11 @@ package org.apache.commons.math4.legacy.ode.nonstiff; import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; + import org.apache.commons.math4.core.jdkmath.JdkMath; +import java.io.Serial; + /** * This class represents an interpolator over the last step during an * ODE integration for the 6th order Luther integrator. @@ -35,6 +38,7 @@ class LutherStepInterpolator extends RungeKuttaStepInterpolator { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20140416L; /** Square root. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/MidpointStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/MidpointStepInterpolator.java index 81081e647d..ff0fe09195 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/MidpointStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/MidpointStepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; /** @@ -46,8 +48,9 @@ class MidpointStepInterpolator extends RungeKuttaStepInterpolator { - /** Serializable version identifier. */ - private static final long serialVersionUID = 20111120L; + /** Serializable version identifier. */ + @Serial + private static final long serialVersionUID = 20111120L; /** Simple constructor. * This constructor builds an instance that is not usable yet, the diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ThreeEighthesStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ThreeEighthesStepInterpolator.java index 95cfbe0fb6..d48e3210ee 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ThreeEighthesStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/nonstiff/ThreeEighthesStepInterpolator.java @@ -17,6 +17,8 @@ package org.apache.commons.math4.legacy.ode.nonstiff; +import java.io.Serial; + import org.apache.commons.math4.legacy.ode.sampling.StepInterpolator; /** @@ -56,8 +58,9 @@ class ThreeEighthesStepInterpolator extends RungeKuttaStepInterpolator { - /** Serializable version identifier. */ - private static final long serialVersionUID = 20111120L; + /** Serializable version identifier. */ + @Serial + private static final long serialVersionUID = 20111120L; /** Simple constructor. * This constructor builds an instance that is not usable yet, the diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/sampling/NordsieckStepInterpolator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/sampling/NordsieckStepInterpolator.java index 32086c93b6..0cbccb36ca 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/sampling/NordsieckStepInterpolator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/sampling/NordsieckStepInterpolator.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import java.util.Arrays; import org.apache.commons.math4.legacy.exception.MaxCountExceededException; @@ -41,6 +42,7 @@ public class NordsieckStepInterpolator extends AbstractStepInterpolator { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -7179861704951334960L; /** State variation. */ diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseMultivariateOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseMultivariateOptimizer.java index 3135c9f8ad..2fe6d62357 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseMultivariateOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseMultivariateOptimizer.java @@ -83,12 +83,11 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof InitialGuess) { - start = ((InitialGuess) data).getInitialGuess(); + if (data instanceof InitialGuess guess) { + start = guess.getInitialGuess(); continue; } - if (data instanceof SimpleBounds) { - final SimpleBounds bounds = (SimpleBounds) data; + if (data instanceof SimpleBounds bounds) { lowerBound = bounds.getLower(); upperBound = bounds.getUpper(); continue; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java index c3d62e8ccc..d6ebd944cf 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java @@ -235,20 +235,19 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof MaxEval) { - maxEvaluations = ((MaxEval) data).getMaxEval(); + if (data instanceof MaxEval eval) { + maxEvaluations = eval.getMaxEval(); continue; } - if (data instanceof MaxIter) { - maxIterations = ((MaxIter) data).getMaxIter(); + if (data instanceof MaxIter iter) { + maxIterations = iter.getMaxIter(); continue; } if (data instanceof ConvergenceChecker) { checker = (ConvergenceChecker) data; continue; } - if (data instanceof Tolerance) { - final Tolerance tol = (Tolerance) data; + if (data instanceof Tolerance tol) { relativeTolerance = tol.getRelativeTolerance(); absoluteTolerance = tol.getAbsoluteTolerance(); continue; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java index 87b096339b..678e904863 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java @@ -79,8 +79,7 @@ public double[] getPointRef() { @Override public boolean equals(Object o) { - if (o instanceof PointValuePair) { - final PointValuePair other = (PointValuePair) o; + if (o instanceof PointValuePair other) { return getValue().equals(other.getValue()) && Arrays.equals(getPointRef(), diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearConstraint.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearConstraint.java index 82ea6d7f73..006eccce7f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearConstraint.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearConstraint.java @@ -180,8 +180,7 @@ public boolean equals(Object other) { if (this == other) { return true; } - if (other instanceof LinearConstraint) { - LinearConstraint rhs = (LinearConstraint) other; + if (other instanceof LinearConstraint rhs) { return relationship == rhs.relationship && value == rhs.value && coefficients.equals(rhs.coefficients); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearObjectiveFunction.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearObjectiveFunction.java index ac88ba981b..37acbe5215 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearObjectiveFunction.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearObjectiveFunction.java @@ -103,8 +103,7 @@ public boolean equals(Object other) { if (this == other) { return true; } - if (other instanceof LinearObjectiveFunction) { - LinearObjectiveFunction rhs = (LinearObjectiveFunction) other; + if (other instanceof LinearObjectiveFunction rhs) { return constantTerm == rhs.constantTerm && coefficients.equals(rhs.coefficients); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearOptimizer.java index 94806c1895..e947afecc3 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/LinearOptimizer.java @@ -115,16 +115,16 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof LinearObjectiveFunction) { - function = (LinearObjectiveFunction) data; + if (data instanceof LinearObjectiveFunction objectiveFunction) { + function = objectiveFunction; continue; } - if (data instanceof LinearConstraintSet) { - linearConstraints = ((LinearConstraintSet) data).getConstraints(); + if (data instanceof LinearConstraintSet set) { + linearConstraints = set.getConstraints(); continue; } - if (data instanceof NonNegativeConstraint) { - nonNegative = ((NonNegativeConstraint) data).isRestrictedToNonNegative(); + if (data instanceof NonNegativeConstraint constraint) { + nonNegative = constraint.isRestrictedToNonNegative(); continue; } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/NoFeasibleSolutionException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/NoFeasibleSolutionException.java index 3a9aa012ba..4464e57e3d 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/NoFeasibleSolutionException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/NoFeasibleSolutionException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.optim.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalStateException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class NoFeasibleSolutionException extends MathIllegalStateException { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = -3044253632189082760L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexSolver.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexSolver.java index 91b8d7ec9a..863f85cbe2 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexSolver.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexSolver.java @@ -177,12 +177,12 @@ protected void parseOptimizationData(OptimizationData... optData) { solutionCallback = null; for (OptimizationData data : optData) { - if (data instanceof SolutionCallback) { - solutionCallback = (SolutionCallback) data; + if (data instanceof SolutionCallback callback) { + solutionCallback = callback; continue; } - if (data instanceof PivotSelectionRule) { - pivotSelection = (PivotSelectionRule) data; + if (data instanceof PivotSelectionRule rule) { + pivotSelection = rule; continue; } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexTableau.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexTableau.java index 16a73ddfc1..e7a7c07db0 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexTableau.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SimplexTableau.java @@ -852,8 +852,7 @@ public boolean equals(Object other) { return true; } - if (other instanceof SimplexTableau) { - SimplexTableau rhs = (SimplexTableau) other; + if (other instanceof SimplexTableau rhs) { return restrictToNonNegative == rhs.restrictToNonNegative && numDecisionVariables == rhs.numDecisionVariables && numSlackVariables == rhs.numSlackVariables && diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/UnboundedSolutionException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/UnboundedSolutionException.java index 4362981350..b418532c8f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/UnboundedSolutionException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/UnboundedSolutionException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.optim.linear; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalStateException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; @@ -26,6 +28,7 @@ */ public class UnboundedSolutionException extends MathIllegalStateException { /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 940539497277290619L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/GradientMultivariateOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/GradientMultivariateOptimizer.java index 3c3653a425..9d489e47fc 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/GradientMultivariateOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/GradientMultivariateOptimizer.java @@ -91,8 +91,8 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof ObjectiveFunctionGradient) { - gradient = ((ObjectiveFunctionGradient) data).getObjectiveFunctionGradient(); + if (data instanceof ObjectiveFunctionGradient functionGradient) { + gradient = functionGradient.getObjectiveFunctionGradient(); // If more data must be parsed, this statement _must_ be // changed to "continue". break; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/MultivariateOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/MultivariateOptimizer.java index 35a954bff9..36e9ea7e37 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/MultivariateOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/MultivariateOptimizer.java @@ -99,12 +99,12 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof GoalType) { - goal = (GoalType) data; + if (data instanceof GoalType type) { + goal = type; continue; } - if (data instanceof ObjectiveFunction) { - final MultivariateFunction delegate = ((ObjectiveFunction) data).getObjectiveFunction(); + if (data instanceof ObjectiveFunction objectiveFunction) { + final MultivariateFunction delegate = objectiveFunction.getObjectiveFunction(); function = new MultivariateFunction() { @Override public double value(double[] point) { @@ -114,8 +114,7 @@ public double value(double[] point) { }; continue; } - if (data instanceof LineSearchTolerance) { - final LineSearchTolerance tol = (LineSearchTolerance) data; + if (data instanceof LineSearchTolerance tol) { lineSearchRelativeTolerance = tol.getRelativeTolerance(); lineSearchAbsoluteTolerance = tol.getAbsoluteTolerance(); lineSearchInitialBracketingRange = tol.getInitialBracketingRange(); diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java index 4c570b7cde..8cd0cb358c 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java @@ -482,12 +482,12 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof Sigma) { - inputSigma = ((Sigma) data).getSigma(); + if (data instanceof Sigma sigma1) { + inputSigma = sigma1.getSigma(); continue; } - if (data instanceof PopulationSize) { - lambda = ((PopulationSize) data).getPopulationSize(); + if (data instanceof PopulationSize size) { + lambda = size.getPopulationSize(); continue; } } @@ -830,8 +830,8 @@ public boolean equals(Object other) { return true; } - if (other instanceof DoubleIndex) { - return Double.compare(value, ((DoubleIndex) other).value) == 0; + if (other instanceof DoubleIndex doubleIndex) { + return Double.compare(value, doubleIndex.value) == 0; } return false; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java index a8b76a04be..201c562fed 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java @@ -303,14 +303,14 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused // if not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof Simplex) { - initialSimplex = (Simplex) data; - } else if (data instanceof Simplex.TransformFactory) { - updateRule = (Simplex.TransformFactory) data; - } else if (data instanceof SimulatedAnnealing) { - simulatedAnnealing = (SimulatedAnnealing) data; - } else if (data instanceof PopulationSize) { - populationSize = ((PopulationSize) data).getPopulationSize(); + if (data instanceof Simplex simplex) { + initialSimplex = simplex; + } else if (data instanceof Simplex.TransformFactory factory) { + updateRule = factory; + } else if (data instanceof SimulatedAnnealing annealing) { + simulatedAnnealing = annealing; + } else if (data instanceof PopulationSize size) { + populationSize = size.getPopulationSize(); } } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/UnivariateOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/UnivariateOptimizer.java index 1b170adfaf..aa59bfad51 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/UnivariateOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/UnivariateOptimizer.java @@ -97,15 +97,14 @@ protected void parseOptimizationData(OptimizationData... optData) { // The existing values (as set by the previous call) are reused if // not provided in the argument list. for (OptimizationData data : optData) { - if (data instanceof SearchInterval) { - final SearchInterval interval = (SearchInterval) data; + if (data instanceof SearchInterval interval) { min = interval.getMin(); max = interval.getMax(); start = interval.getStartValue(); continue; } - if (data instanceof UnivariateObjectiveFunction) { - final UnivariateFunction delegate = ((UnivariateObjectiveFunction) data).getObjectiveFunction(); + if (data instanceof UnivariateObjectiveFunction objectiveFunction) { + final UnivariateFunction delegate = objectiveFunction.getObjectiveFunction(); function = new UnivariateFunction() { @Override public double value(double point) { @@ -115,8 +114,8 @@ public double value(double point) { }; continue; } - if (data instanceof GoalType) { - goal = (GoalType) data; + if (data instanceof GoalType type) { + goal = type; continue; } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/SpearmansCorrelation.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/SpearmansCorrelation.java index ab47617948..2d398ce710 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/SpearmansCorrelation.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/SpearmansCorrelation.java @@ -66,8 +66,8 @@ public SpearmansCorrelation() { public SpearmansCorrelation(final RankingAlgorithm rankingAlgorithm) throws MathIllegalArgumentException { - if (rankingAlgorithm instanceof NaturalRanking && - NaNStrategy.REMOVED == ((NaturalRanking) rankingAlgorithm).getNanStrategy()) { + if (rankingAlgorithm instanceof NaturalRanking ranking && + NaNStrategy.REMOVED == ranking.getNanStrategy()) { throw new MathIllegalArgumentException(LocalizedFormats.NOT_SUPPORTED_NAN_STRATEGY, NaNStrategy.REMOVED); } @@ -100,8 +100,8 @@ public SpearmansCorrelation(final RealMatrix dataMatrix) { public SpearmansCorrelation(final RealMatrix dataMatrix, final RankingAlgorithm rankingAlgorithm) throws MathIllegalArgumentException { - if (rankingAlgorithm instanceof NaturalRanking && - NaNStrategy.REMOVED == ((NaturalRanking) rankingAlgorithm).getNanStrategy()) { + if (rankingAlgorithm instanceof NaturalRanking ranking && + NaNStrategy.REMOVED == ranking.getNanStrategy()) { throw new MathIllegalArgumentException(LocalizedFormats.NOT_SUPPORTED_NAN_STRATEGY, NaNStrategy.REMOVED); } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatistics.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatistics.java index 518488495c..79a8e09bc0 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatistics.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatistics.java @@ -445,8 +445,8 @@ public double getElement(int index) { * @throws MathIllegalArgumentException if p is not a valid quantile */ public double getPercentile(double p) throws MathIllegalStateException, MathIllegalArgumentException { - if (percentileImpl instanceof Percentile) { - ((Percentile) percentileImpl).setQuantile(p); + if (percentileImpl instanceof Percentile percentile) { + percentile.setQuantile(p); } else { try { percentileImpl.getClass().getMethod(SET_QUANTILE_METHOD_NAME, Double.TYPE) diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java index e64e0f6673..03e177793f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java @@ -165,12 +165,12 @@ public void increment(final double observation) { public String toString() { if (markers == null) { - return String.format("obs=%s pValue=%s", - DECIMAL_FORMAT.format(lastObservation), - DECIMAL_FORMAT.format(pValue)); + return "obs=%s pValue=%s".formatted( + DECIMAL_FORMAT.format(lastObservation), + DECIMAL_FORMAT.format(pValue)); } else { - return String.format("obs=%s markers=%s", - DECIMAL_FORMAT.format(lastObservation), markers.toString()); + return "obs=%s markers=%s".formatted( + DECIMAL_FORMAT.format(lastObservation), markers.toString()); } } @@ -483,10 +483,10 @@ public Markers copy() { */ @Override public String toString() { - return String.format("m1=[%s],m2=[%s],m3=[%s],m4=[%s],m5=[%s]", - markerArray[1].toString(), markerArray[2].toString(), - markerArray[3].toString(), markerArray[4].toString(), - markerArray[5].toString()); + return "m1=[%s],m2=[%s],m3=[%s],m4=[%s],m5=[%s]".formatted( + markerArray[1].toString(), markerArray[2].toString(), + markerArray[3].toString(), markerArray[4].toString(), + markerArray[5].toString()); } } @@ -699,13 +699,12 @@ public Marker copy() { */ @Override public String toString() { - return String.format( - "index=%.0f,n=%.0f,np=%.2f,q=%.2f,dn=%.2f,prev=%d,next=%d", - (double) index, Precision.round(intMarkerPosition, 0), - Precision.round(desiredMarkerPosition, 2), - Precision.round(markerHeight, 2), - Precision.round(desiredMarkerIncrement, 2), previous.index, - next.index); + return "index=%.0f,n=%.0f,np=%.2f,q=%.2f,dn=%.2f,prev=%d,next=%d".formatted( + (double) index, Precision.round(intMarkerPosition, 0), + Precision.round(desiredMarkerPosition, 2), + Precision.round(markerHeight, 2), + Precision.round(desiredMarkerIncrement, 2), previous.index, + next.index); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/regression/ModelSpecificationException.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/regression/ModelSpecificationException.java index c8dfca5c5e..7836205093 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/regression/ModelSpecificationException.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/regression/ModelSpecificationException.java @@ -16,6 +16,8 @@ */ package org.apache.commons.math4.legacy.stat.regression; +import java.io.Serial; + import org.apache.commons.math4.legacy.exception.MathIllegalArgumentException; import org.apache.commons.math4.legacy.exception.util.Localizable; @@ -26,6 +28,7 @@ */ public class ModelSpecificationException extends MathIllegalArgumentException { /** Serializable version Id. */ + @Serial private static final long serialVersionUID = 4206514456095401070L; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/ComplexFormat.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/ComplexFormat.java index a885984c06..791bde127c 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/ComplexFormat.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/ComplexFormat.java @@ -268,10 +268,10 @@ public StringBuffer format(Object obj, StringBuffer toAppendTo, StringBuffer ret = null; - if (obj instanceof Complex) { - ret = format( (Complex)obj, toAppendTo, pos); - } else if (obj instanceof Number) { - ret = format(Complex.ofCartesian(((Number)obj).doubleValue(), 0.0), + if (obj instanceof Complex complex) { + ret = format( complex, toAppendTo, pos); + } else if (obj instanceof Number number) { + ret = format(Complex.ofCartesian(number.doubleValue(), 0.0), toAppendTo, pos); } else { throw new MathIllegalArgumentException(LocalizedFormats.CANNOT_FORMAT_INSTANCE_AS_COMPLEX, diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java index 1af30fa49a..e45ffad811 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java @@ -16,6 +16,9 @@ */ package org.apache.commons.math4.legacy.field.linalg; +import java.util.concurrent.ThreadLocalRandom; + + import org.junit.Assert; import org.junit.Test; import org.apache.commons.numbers.field.FP64; @@ -274,7 +277,7 @@ private Pair, RealMatrix> createRandom(int r, final RealMatrix b = new Array2DRowRealMatrix(r, c); for (int i = 0; i < r; i++) { for (int j = 0; j < c; j++) { - final double v = scale * (2 * Math.random() - 1); + final double v = scale * (2 * ThreadLocalRandom.current().nextDouble() - 1); a.set(i, j, FP64.of(v)); b.setEntry(i, j, v); } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ArrayFieldVectorTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ArrayFieldVectorTest.java index 4c1301efb8..80d6075f6d 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ArrayFieldVectorTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ArrayFieldVectorTest.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.lang.reflect.Array; import java.util.Arrays; +import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.math4.legacy.core.Field; import org.apache.commons.math4.legacy.core.FieldElement; @@ -615,7 +616,7 @@ public void testSerial() { final int n = 2; ArrayFieldVector v = new ArrayFieldVector<>(BigRealField.getInstance()); for (int i = 0; i < n; i++) { - v.append(new BigReal(Math.random())); + v.append(new BigReal(ThreadLocalRandom.current().nextDouble())); } Assert.assertEquals(v, TestUtils.serializeAndRecover(v)); } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ConjugateGradientTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ConjugateGradientTest.java index 89f7b935d3..000a1f3840 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ConjugateGradientTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/ConjugateGradientTest.java @@ -90,7 +90,7 @@ public void testUnpreconditionedSolution() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-10 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d]", i, j); + final String msg = "entry[%d][%d]".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -116,7 +116,7 @@ public void testUnpreconditionedInPlaceSolutionWithInitialGuess() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-10 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d)", i, j); + final String msg = "entry[%d][%d)".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -142,7 +142,7 @@ public void testUnpreconditionedSolutionWithInitialGuess() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-10 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d]", i, j); + final String msg = "entry[%d][%d]".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); Assert.assertEquals(msg, x0.getEntry(i), 1., Math.ulp(1.)); } @@ -207,8 +207,8 @@ public void initializationPerformed(final IterationEvent e) { final double actual = b.getEntry(i) - y.getEntry(i); final double expected = r.getEntry(i); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String - .format("column %d, residual %d", i, j); + final String msg = "column %d, residual %d" + .formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -323,7 +323,7 @@ public void testPreconditionedSolution() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("coefficient (%d, %d)", i, j); + final String msg = "coefficient (%d, %d)".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -383,7 +383,7 @@ public void initializationPerformed(final IterationEvent e) { final double actual = b.getEntry(i) - y.getEntry(i); final double expected = r.getEntry(i); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("column %d, residual %d", i, j); + final String msg = "column %d, residual %d".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -424,10 +424,10 @@ public void testPreconditionedSolution2() { final RealVector x = cg.solve(a, b); final int npcg = pcg.getIterationManager().getIterations(); final int ncg = cg.getIterationManager().getIterations(); - msg = String.format(pattern, npcg, ncg); + msg = pattern.formatted(npcg, ncg); Assert.assertTrue(msg, npcg < ncg); for (int i = 0; i < n; i++) { - msg = String.format("row %d, column %d", i, j); + msg = "row %d, column %d".formatted(i, j); final double expected = x.getEntry(i); final double actual = px.getEntry(i); final double delta = 1E-6 * JdkMath.abs(expected); @@ -509,9 +509,9 @@ public void terminationPerformed(final IterationEvent e) { b.set(0.); b.setEntry(j, 1.); solver.solve(a, b); - String msg = String.format("column %d (initialization)", j); + String msg = "column %d (initialization)".formatted(j); Assert.assertEquals(msg, 1, count[0]); - msg = String.format("column %d (finalization)", j); + msg = "column %d (finalization)".formatted(j); Assert.assertEquals(msg, 1, count[3]); } } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/SymmLQTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/SymmLQTest.java index 96f1d5c131..3ce45a33e8 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/SymmLQTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/SymmLQTest.java @@ -256,7 +256,7 @@ public void testUnpreconditionedSolution() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d]", i, j); + final String msg = "entry[%d][%d]".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -282,7 +282,7 @@ public void testUnpreconditionedInPlaceSolutionWithInitialGuess() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d)", i, j); + final String msg = "entry[%d][%d)".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -308,7 +308,7 @@ public void testUnpreconditionedSolutionWithInitialGuess() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("entry[%d][%d]", i, j); + final String msg = "entry[%d][%d]".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); Assert.assertEquals(msg, x0.getEntry(i), 1., Math.ulp(1.)); } @@ -420,7 +420,7 @@ public void testPreconditionedSolution() { final double actual = x.getEntry(i); final double expected = ainv.getEntry(i, j); final double delta = 1E-6 * JdkMath.abs(expected); - final String msg = String.format("coefficient (%d, %d)", i, j); + final String msg = "coefficient (%d, %d)".formatted(i, j); Assert.assertEquals(msg, expected, actual, delta); } } @@ -459,9 +459,9 @@ public void testPreconditionedSolution2() { final RealVector x = unprec.solve(a, b); final int np = prec.getIterationManager().getIterations(); final int nup = unprec.getIterationManager().getIterations(); - msg = String.format(pattern, np, nup); + msg = pattern.formatted(np, nup); for (int i = 0; i < n; i++) { - msg = String.format("row %d, column %d", i, j); + msg = "row %d, column %d".formatted(i, j); final double expected = x.getEntry(i); final double actual = px.getEntry(i); final double delta = 5E-5 * JdkMath.abs(expected); @@ -523,9 +523,9 @@ public void terminationPerformed(final IterationEvent e) { b.set(0.); b.setEntry(j, 1.); final RealVector xFromSolver = solver.solve(a, b); - String msg = String.format("column %d (initialization)", j); + String msg = "column %d (initialization)".formatted(j); Assert.assertEquals(msg, 1, count[0]); - msg = String.format("column %d (finalization)", j); + msg = "column %d (finalization)".formatted(j); Assert.assertEquals(msg, 1, count[3]); /* * Check that solution is not "over-refined". When the last @@ -533,7 +533,7 @@ public void terminationPerformed(final IterationEvent e) { * performed. */ for (int i = 0; i < n; i++){ - msg = String.format("row %d, column %d", i, j); + msg = "row %d, column %d".formatted(i, j); final double expected = xFromSolver.getEntry(i); final double actual = xFromListener.getEntry(i); Assert.assertEquals(msg, expected, actual, 0.0); diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/UnmodifiableRealVectorAbstractTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/UnmodifiableRealVectorAbstractTest.java index c0f31271ce..2225b2d32d 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/UnmodifiableRealVectorAbstractTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/linear/UnmodifiableRealVectorAbstractTest.java @@ -195,45 +195,45 @@ public static boolean equals(final RealMatrix x, final RealMatrix y) { */ public static boolean equals(final Object x, final Object y) { if (x instanceof Boolean) { - if (y instanceof Boolean) { - return ((Boolean) x).booleanValue() == ((Boolean) y) + if (y instanceof Boolean boolean1) { + return ((Boolean) x).booleanValue() == boolean1 .booleanValue(); } else { return false; } } if (x instanceof Integer) { - if (y instanceof Integer) { - return ((Integer) x).intValue() == ((Integer) y).intValue(); + if (y instanceof Integer integer) { + return ((Integer) x).intValue() == integer.intValue(); } else { return false; } } else if (x instanceof Double) { - if (y instanceof Double) { + if (y instanceof Double double1) { return equals(((Double) x).doubleValue(), - ((Double) y).doubleValue()); + double1.doubleValue()); } else { return false; } } else if (x instanceof double[]) { - if (y instanceof double[]) { - return equals((double[]) x, (double[]) y); - } else if (y instanceof RealVector) { - return equals((RealVector) y, (double[]) x); + if (y instanceof double[] doubles) { + return equals((double[]) x, doubles); + } else if (y instanceof RealVector vector) { + return equals(vector, (double[]) x); } else { return false; } } else if (x instanceof RealVector) { - if (y instanceof double[]) { - return equals((RealVector) x, (double[]) y); - } else if (y instanceof RealVector) { - return equals((RealVector) x, (RealVector) y); + if (y instanceof double[] doubles1) { + return equals((RealVector) x, doubles1); + } else if (y instanceof RealVector vector1) { + return equals((RealVector) x, vector1); } else { return false; } } else if (x instanceof RealMatrix) { - if (y instanceof RealMatrix) { - return equals((RealMatrix) x, (RealMatrix) y); + if (y instanceof RealMatrix matrix) { + return equals((RealMatrix) x, matrix); } else { return false; } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClustererTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClustererTest.java index 8b9c222e8a..f52c5cd193 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClustererTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClustererTest.java @@ -84,7 +84,7 @@ public void testCompareToKMeans() { double scoreDiffRatio = (kMeansScore - miniBatchKMeansScore) / kMeansScore; // MiniBatchKMeansClusterer has few score differences between KMeansClusterer(less then 10%). - Assert.assertTrue(String.format("Different score ratio %f%%!, diff points ratio: %f%%", scoreDiffRatio * 100, diffPointsRatio * 100), + Assert.assertTrue("Different score ratio %f%%!, diff points ratio: %f%%".formatted(scoreDiffRatio * 100, diffPointsRatio * 100), scoreDiffRatio < 0.1); } } @@ -135,7 +135,7 @@ List generateCircle(int count, double[] center, double radius, public static void assertException(Runnable block, Class exceptionClass) { try { block.run(); - Assert.fail(String.format("Expects %s", exceptionClass.getSimpleName())); + Assert.fail("Expects %s".formatted(exceptionClass.getSimpleName())); } catch (Throwable e) { if (!exceptionClass.isInstance(e)) { throw e; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/nonstiff/Decimal64.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/nonstiff/Decimal64.java index c94d0b5207..6892649bdd 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/nonstiff/Decimal64.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/nonstiff/Decimal64.java @@ -17,7 +17,10 @@ package org.apache.commons.math4.legacy.ode.nonstiff; import org.apache.commons.numbers.core.Sum; + import org.apache.commons.math4.core.jdkmath.JdkMath; + +import java.io.Serial; import org.apache.commons.math4.legacy.core.Field; import org.apache.commons.math4.legacy.core.RealFieldElement; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; @@ -54,6 +57,7 @@ public class Decimal64 extends Number public static final Decimal64 NAN; /** */ + @Serial private static final long serialVersionUID = 20120227L; static { @@ -254,8 +258,7 @@ public int compareTo(final Decimal64 o) { /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { - if (obj instanceof Decimal64) { - final Decimal64 that = (Decimal64) obj; + if (obj instanceof Decimal64 that) { return Double.doubleToLongBits(this.value) == Double .doubleToLongBits(that.value); } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/sampling/DummyStepInterpolator.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/sampling/DummyStepInterpolator.java index 4e96ceb24f..5570dbdafb 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/sampling/DummyStepInterpolator.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/ode/sampling/DummyStepInterpolator.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import org.apache.commons.math4.legacy.ode.EquationsMapper; @@ -39,8 +40,9 @@ public class DummyStepInterpolator extends AbstractStepInterpolator { - /** Serializable version identifier. */ - private static final long serialVersionUID = 1708010296707839488L; + /** Serializable version identifier. */ + @Serial + private static final long serialVersionUID = 1708010296707839488L; /** Current derivative. */ private double[] currentDerivative; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizerTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizerTest.java index c7826cae7a..15242d48ec 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizerTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/SimplexOptimizerTest.java @@ -22,7 +22,7 @@ import java.io.PrintWriter; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.nio.file.StandardOpenOption; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -250,7 +250,7 @@ private SimplexOptimizer.Observer createCallback(Simplex.TransformFactory factor factory + sep); // Create file; write first data block (optimum) and columns header. - try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get(name)))) { + try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Path.of(name)))) { out.println("# Function: " + function); out.println("# Transform: " + factory); out.println("#"); @@ -276,7 +276,7 @@ private SimplexOptimizer.Observer createCallback(Simplex.TransformFactory factor // Return callback function. return (simplex, isInit, numEval) -> { - try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get(name), + try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Path.of(name), StandardOpenOption.APPEND))) { if (isInit) { // Blank line indicating the start of an optimization @@ -317,7 +317,7 @@ private SimplexOptimizer.Observer createCallback(Simplex.TransformFactory factor public void checkAlongLine(int numPoints) { if (tracePrefix != null) { final String name = tracePrefix + createPlotBasename(function, start, optimum); - try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get(name)))) { + try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Path.of(name)))) { checkAlongLine(numPoints, out); } catch (IOException e) { Assertions.fail(e.getMessage()); diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/CertifiedDataTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/CertifiedDataTest.java index 867723119d..20872c26c1 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/CertifiedDataTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/CertifiedDataTest.java @@ -99,8 +99,8 @@ private void loadStats(String resource, Object u) throws Exception { DescriptiveStatistics d = null; SummaryStatistics s = null; - if (u instanceof DescriptiveStatistics) { - d = (DescriptiveStatistics) u; + if (u instanceof DescriptiveStatistics statistics) { + d = statistics; } else { s = (SummaryStatistics) u; } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatisticsTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatisticsTest.java index c47e7f57f0..c12d9c4caa 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatisticsTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/DescriptiveStatisticsTest.java @@ -149,15 +149,17 @@ public void testToString() { stats.addValue(3); Locale d = Locale.getDefault(); Locale.setDefault(Locale.US); - Assert.assertEquals("DescriptiveStatistics:\n" + - "n: 3\n" + - "min: 1.0\n" + - "max: 3.0\n" + - "mean: 2.0\n" + - "std dev: 1.0\n" + - "median: 2.0\n" + - "skewness: 0.0\n" + - "kurtosis: NaN\n", stats.toString()); + Assert.assertEquals(""" + DescriptiveStatistics: + n: 3 + min: 1.0 + max: 3.0 + mean: 2.0 + std dev: 1.0 + median: 2.0 + skewness: 0.0 + kurtosis: NaN + """, stats.toString()); Locale.setDefault(d); } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/StatisticalSummaryValuesTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/StatisticalSummaryValuesTest.java index b46f77c3d7..8cc32f0fb5 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/StatisticalSummaryValuesTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/StatisticalSummaryValuesTest.java @@ -42,14 +42,16 @@ public void testToString() { StatisticalSummaryValues u = new StatisticalSummaryValues(4.5, 16, 10, 5, 4, 45); Locale d = Locale.getDefault(); Locale.setDefault(Locale.US); - Assert.assertEquals("StatisticalSummaryValues:\n" + - "n: 10\n" + - "min: 4.0\n" + - "max: 5.0\n" + - "mean: 4.5\n" + - "std dev: 4.0\n" + - "variance: 16.0\n" + - "sum: 45.0\n", u.toString()); + Assert.assertEquals(""" + StatisticalSummaryValues: + n: 10 + min: 4.0 + max: 5.0 + mean: 4.5 + std dev: 4.0 + variance: 16.0 + sum: 45.0 + """, u.toString()); Locale.setDefault(d); } } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentileTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentileTest.java index c671de6c08..317199d6d8 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentileTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentileTest.java @@ -414,9 +414,8 @@ private void assertValues(Double a, Double b, double delta) { double max = JdkMath.max(a, b); double percentage = JdkMath.abs(a - b) / max; double deviation = delta; - Assert.assertTrue(String.format( - "Deviated = %f and is beyond %f as a=%f, b=%f", - percentage, deviation, a, b), percentage < deviation); + Assert.assertTrue("Deviated = %f and is beyond %f as a=%f, b=%f".formatted( + percentage, deviation, a, b), percentage < deviation); } } @@ -570,7 +569,7 @@ public void testPSQuaredEvalFuncWithPapersExampleData() throws IOException { // Well the values deviate in our calculation by 0.25 so its 4.25 vs // 4.44 Assert.assertEquals( - String.format("Expected=%f, Actual=%f", expected, p2value), + "Expected=%f, Actual=%f".formatted(expected, p2value), expected, p2value, 0.25); } diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/regression/GLSMultipleLinearRegressionTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/regression/GLSMultipleLinearRegressionTest.java index 7878c002fb..921ae6f363 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/regression/GLSMultipleLinearRegressionTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/stat/regression/GLSMultipleLinearRegressionTest.java @@ -294,7 +294,7 @@ public void testGLSEfficiency() { // Verify that GLS is on average more efficient, lower variance Assertions.assertTrue(olsBetaStats.getMean() > 1.1 * glsBetaStats.getMean(), - () -> String.format("OLS %s : GLS %s", olsBetaStats.getMean(), glsBetaStats.getMean())); + () -> "OLS %s : GLS %s".formatted(olsBetaStats.getMean(), glsBetaStats.getMean())); Assert.assertTrue(olsBetaStats.getStandardDeviation() > glsBetaStats.getStandardDeviation()); } } diff --git a/commons-math-neuralnet/src/main/java/org/apache/commons/math4/neuralnet/internal/NeuralNetException.java b/commons-math-neuralnet/src/main/java/org/apache/commons/math4/neuralnet/internal/NeuralNetException.java index 3f73c8123a..4f68ce0ccc 100644 --- a/commons-math-neuralnet/src/main/java/org/apache/commons/math4/neuralnet/internal/NeuralNetException.java +++ b/commons-math-neuralnet/src/main/java/org/apache/commons/math4/neuralnet/internal/NeuralNetException.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.neuralnet.internal; +import java.io.Serial; import java.text.MessageFormat; /** @@ -40,6 +41,7 @@ public class NeuralNetException extends IllegalArgumentException { public static final String ID_NOT_FOUND = "Identifier not found: {0}"; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20210515L; /** diff --git a/commons-math-transform/src/main/java/org/apache/commons/math4/transform/TransformException.java b/commons-math-transform/src/main/java/org/apache/commons/math4/transform/TransformException.java index 0591b330d8..71c45fba81 100644 --- a/commons-math-transform/src/main/java/org/apache/commons/math4/transform/TransformException.java +++ b/commons-math-transform/src/main/java/org/apache/commons/math4/transform/TransformException.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.transform; +import java.io.Serial; import java.text.MessageFormat; /** @@ -37,6 +38,7 @@ class TransformException extends IllegalArgumentException { public static final String NOT_POWER_OF_TWO = "{0} is not equal to pow(2, n), for some n"; /** Serializable version identifier. */ + @Serial private static final long serialVersionUID = 20210522L; /** diff --git a/commons-math-transform/src/test/java/org/apache/commons/math4/transform/FastFourierTransformerTest.java b/commons-math-transform/src/test/java/org/apache/commons/math4/transform/FastFourierTransformerTest.java index 1f746aa12b..159c5aa831 100644 --- a/commons-math-transform/src/test/java/org/apache/commons/math4/transform/FastFourierTransformerTest.java +++ b/commons-math-transform/src/test/java/org/apache/commons/math4/transform/FastFourierTransformerTest.java @@ -185,10 +185,10 @@ private static void doTestTransformComplex(final int n, final int index = i; final double re = s * expected[i].getReal(); assertEqualsRelativeOrAbsolute(re, actual[i].getReal(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); final double im = s * expected[i].getImaginary(); assertEqualsRelativeOrAbsolute(im, actual[i].getImaginary(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); } } @@ -225,10 +225,10 @@ private static void doTestTransformReal(final int n, final int index = i; final double re = s * expected[i].getReal(); assertEqualsRelativeOrAbsolute(re, actual[i].getReal(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); final double im = s * expected[i].getImaginary(); assertEqualsRelativeOrAbsolute(im, actual[i].getImaginary(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); } } @@ -268,10 +268,10 @@ private static void doTestTransformFunction(final DoubleUnaryOperator f, final int index = i; final double re = s * expected[i].getReal(); assertEqualsRelativeOrAbsolute(re, actual[i].getReal(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); final double im = s * expected[i].getImaginary(); assertEqualsRelativeOrAbsolute(im, actual[i].getImaginary(), tol, absTol, - () -> String.format("%s, %s, %d, %d", normalization, inverse, n, index)); + () -> "%s, %s, %d, %d".formatted(normalization, inverse, n, index)); } } @@ -283,7 +283,7 @@ private static void assertEqualsRelativeOrAbsolute(double expected, double actua final double absoluteMax = Math.max(Math.abs(expected), Math.abs(actual)); final double abs = Math.abs(expected - actual); final double rel = abs / absoluteMax; - final Supplier message = () -> String.format("%s: rel=%s, abs=%s", msg.get(), rel, abs); + final Supplier message = () -> "%s: rel=%s, abs=%s".formatted(msg.get(), rel, abs); // Re-use assertEquals to obtain the formatting Assertions.assertEquals(expected, actual, message); } diff --git a/commons-math-transform/src/test/java/org/apache/commons/math4/transform/RealTransformerAbstractTest.java b/commons-math-transform/src/test/java/org/apache/commons/math4/transform/RealTransformerAbstractTest.java index 47e86ed050..292c420761 100644 --- a/commons-math-transform/src/test/java/org/apache/commons/math4/transform/RealTransformerAbstractTest.java +++ b/commons-math-transform/src/test/java/org/apache/commons/math4/transform/RealTransformerAbstractTest.java @@ -300,7 +300,7 @@ private void doTestTransformReal(final int n, final double[] actual = transformer.apply(x); for (int i = 0; i < n; i++) { final double delta = tol * Math.abs(expected[i]); - final String msg = String.format("%d, %d (%g, %g)", n, i, tol, delta); + final String msg = "%d, %d (%g, %g)".formatted(n, i, tol, delta); Assert.assertEquals(msg, expected[i], actual[i], delta); } } @@ -320,7 +320,7 @@ private void doTestTransformFunction(final int n, final double[] expected = transform(x, type); final double[] actual = transformer.apply(f, a, b, n); for (int i = 0; i < n; i++) { - final String msg = String.format("%d, %d", n, i); + final String msg = "%d, %d".formatted(n, i); final double delta = tol * Math.abs(expected[i]); Assert.assertEquals(msg, expected[i], actual[i], delta); } diff --git a/pom.xml b/pom.xml index de0593df67..eb9a29cf7f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ 2003 + 17 @@ -57,8 +58,8 @@ MATH 12310485 UTF-8 - 1.8 - 1.8 + 17 + 17 https://commons.apache.org/js/mathjax/tex-mml-chtml.js 1.3