You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2022/09/26 15:22:37 UTC
[commons-rng] 02/02: Use final
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 43d76ca9b4a70ce374500d6a67bb507028bc807a
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Mon Sep 26 16:21:10 2022 +0100
Use final
---
.../apache/commons/rng/UniformRandomProviderTest.java | 10 +++++-----
.../org/apache/commons/rng/core/BaseProviderTest.java | 2 +-
.../commons/rng/core/Providers32ParametricTest.java | 4 ++--
.../commons/rng/core/Providers64ParametricTest.java | 4 ++--
.../rng/core/ProvidersCommonParametricTest.java | 6 +++---
.../org/apache/commons/rng/core/ProvidersList.java | 2 +-
.../java/org/apache/commons/rng/core/RandomAssert.java | 2 +-
.../rng/core/SplittableProvidersParametricTest.java | 4 ++--
.../commons/rng/sampling/CombinationSamplerTest.java | 6 +++---
.../commons/rng/sampling/PermutationSamplerTest.java | 2 +-
.../apache/commons/rng/simple/JDKRandomBridgeTest.java | 8 ++++----
.../rng/simple/ProvidersCommonParametricTest.java | 18 +++++++++---------
.../org/apache/commons/rng/simple/ProvidersList.java | 2 +-
.../apache/commons/rng/simple/RandomSourceTest.java | 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/commons-rng-client-api/src/test/java/org/apache/commons/rng/UniformRandomProviderTest.java b/commons-rng-client-api/src/test/java/org/apache/commons/rng/UniformRandomProviderTest.java
index 9462d046..cfb40f96 100644
--- a/commons-rng-client-api/src/test/java/org/apache/commons/rng/UniformRandomProviderTest.java
+++ b/commons-rng-client-api/src/test/java/org/apache/commons/rng/UniformRandomProviderTest.java
@@ -213,7 +213,7 @@ class UniformRandomProviderTest {
void testNextFloatExtremes() {
final UniformRandomProvider rng = new DummyGenerator() {
private int i;
- private int[] values = {0, -1, 1 << 8};
+ private final int[] values = {0, -1, 1 << 8};
@Override
public int nextInt() {
return values[i++];
@@ -244,7 +244,7 @@ class UniformRandomProviderTest {
// This method will be used
final UniformRandomProvider rng = new DummyGenerator() {
private int i;
- private float[] values = {0, 0.25f, 0.5f, 0.75f, 1};
+ private final float[] values = {0, 0.25f, 0.5f, 0.75f, 1};
@Override
public float nextFloat() {
return values[i++];
@@ -289,7 +289,7 @@ class UniformRandomProviderTest {
void testNextDoubleExtremes() {
final UniformRandomProvider rng = new DummyGenerator() {
private int i;
- private long[] values = {0, -1, 1L << 11};
+ private final long[] values = {0, -1, 1L << 11};
@Override
public long nextLong() {
return values[i++];
@@ -320,7 +320,7 @@ class UniformRandomProviderTest {
// This method will be used
final UniformRandomProvider rng = new DummyGenerator() {
private int i;
- private double[] values = {0, 0.25, 0.5, 0.75, 1};
+ private final double[] values = {0, 0.25, 0.5, 0.75, 1};
@Override
public double nextDouble() {
return values[i++];
@@ -801,7 +801,7 @@ class UniformRandomProviderTest {
failedStat.add(chi2);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Should never happen.
throw new RuntimeException("Unexpected", e);
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/BaseProviderTest.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/BaseProviderTest.java
index fb28f5ed..6816e664 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/BaseProviderTest.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/BaseProviderTest.java
@@ -143,7 +143,7 @@ class BaseProviderTest {
// The seed does not matter.
// Create random seeds that are smaller or larger than length.
final SplittableRandom rng = new SplittableRandom();
- for (long[] seed : new long[][] {
+ for (final long[] seed : new long[][] {
{},
rng.longs(1).toArray(),
rng.longs(2).toArray(),
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers32ParametricTest.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers32ParametricTest.java
index 1174e3af..5ac47b19 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers32ParametricTest.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers32ParametricTest.java
@@ -34,8 +34,8 @@ class Providers32ParametricTest {
void testNextBytesChunks(RestorableUniformRandomProvider generator) {
final int[] chunkSizes = {4, 8, 12, 16};
final int[] chunks = {1, 2, 3, 4, 5};
- for (int chunkSize : chunkSizes) {
- for (int numChunks : chunks) {
+ for (final int chunkSize : chunkSizes) {
+ for (final int numChunks : chunks) {
ProvidersCommonParametricTest.checkNextBytesChunks(generator,
chunkSize,
numChunks);
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers64ParametricTest.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers64ParametricTest.java
index 3f595b81..a99fe393 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers64ParametricTest.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/Providers64ParametricTest.java
@@ -33,8 +33,8 @@ class Providers64ParametricTest {
void testNextBytesChunks(RestorableUniformRandomProvider generator) {
final int[] chunkSizes = {8, 16, 24};
final int[] chunks = {1, 2, 3, 4, 5};
- for (int chunkSize : chunkSizes) {
- for (int numChunks : chunks) {
+ for (final int chunkSize : chunkSizes) {
+ for (final int numChunks : chunks) {
ProvidersCommonParametricTest.checkNextBytesChunks(generator,
chunkSize,
numChunks);
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersCommonParametricTest.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersCommonParametricTest.java
index e85089cf..6749906d 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersCommonParametricTest.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersCommonParametricTest.java
@@ -324,7 +324,7 @@ class ProvidersCommonParametricTest {
++observed[buffer[i] & 0xff];
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Should never happen.
throw new RuntimeException("Unexpected");
}
@@ -364,7 +364,7 @@ class ProvidersCommonParametricTest {
--walk;
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Should never happen.
throw new RuntimeException("Unexpected");
}
@@ -513,7 +513,7 @@ class ProvidersCommonParametricTest {
++numFailures;
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Should never happen.
throw new RuntimeException("Unexpected", e);
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
index 0abf3a51..312fdff9 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
@@ -176,7 +176,7 @@ public final class ProvidersList {
LIST.stream()
.filter(rng -> rng instanceof SplittableUniformRandomProvider)
.forEach(rng -> LIST_SPLIT.add((SplittableUniformRandomProvider) rng));
- } catch (Exception e) {
+ } catch (final Exception e) {
// CHECKSTYLE: stop Regexp
System.err.println("Unexpected exception while creating the list of generators: " + e);
e.printStackTrace(System.err);
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/RandomAssert.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/RandomAssert.java
index 75cf2f10..377d1d5b 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/RandomAssert.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/RandomAssert.java
@@ -368,7 +368,7 @@ public final class RandomAssert {
UniformRandomProvider rng, int warmupCycles, int testCycles, int seedElement, int bit) {
try {
assertNextLongNonZeroOutput(rng, warmupCycles, testCycles);
- } catch (AssertionError ex) {
+ } catch (final AssertionError ex) {
Assertions.fail("No non-zero output after " + (warmupCycles + testCycles) + " cycles. " +
"Seed element [" + seedElement + "], bit=" + bit);
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/SplittableProvidersParametricTest.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/SplittableProvidersParametricTest.java
index bf2721e9..b248dc35 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/SplittableProvidersParametricTest.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/SplittableProvidersParametricTest.java
@@ -138,8 +138,8 @@ class SplittableProvidersParametricTest {
@MethodSource("getSplittableProviders")
void testSplitWithSourceIsReproducible(SplittableUniformRandomProvider generator) {
final long seed = ThreadLocalRandom.current().nextLong();
- UniformRandomProvider rng1 = generator.split(new SplittableRandom(seed)::nextLong);
- UniformRandomProvider rng2 = generator.split(new SplittableRandom(seed)::nextLong);
+ final UniformRandomProvider rng1 = generator.split(new SplittableRandom(seed)::nextLong);
+ final UniformRandomProvider rng2 = generator.split(new SplittableRandom(seed)::nextLong);
RandomAssert.assertNextLongEquals(10, rng1, rng2);
}
diff --git a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/CombinationSamplerTest.java b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/CombinationSamplerTest.java
index 97f7cfa6..237cdc9d 100644
--- a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/CombinationSamplerTest.java
+++ b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/CombinationSamplerTest.java
@@ -38,7 +38,7 @@ class CombinationSamplerTest {
for (int k = 1; k <= n; k++) {
final CombinationSampler sampler = new CombinationSampler(rng, n, k);
final int[] random = sampler.sample();
- for (int s : random) {
+ for (final int s : random) {
assertIsInDomain(n, s);
}
}
@@ -154,7 +154,7 @@ class CombinationSamplerTest {
// Codes are positive for all combinations of bits that use k-bits,
// otherwise they are negative.
final int totalBitCombinations = 1 << n;
- int[] codeLookup = new int[totalBitCombinations];
+ final int[] codeLookup = new int[totalBitCombinations];
Arrays.fill(codeLookup, -1); // initialize as negative
int codes = 0;
for (int i = 0; i < totalBitCombinations; i++) {
@@ -189,7 +189,7 @@ class CombinationSamplerTest {
// Each sample index is used to set a bit in an integer.
// The resulting bits should be a valid code.
int bits = 0;
- for (int s : sample) {
+ for (final int s : sample) {
// This shift will be from 0 to n-1 since it is from the
// domain of size n.
bits |= 1 << s;
diff --git a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/PermutationSamplerTest.java b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/PermutationSamplerTest.java
index 94d85f0e..e632974b 100644
--- a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/PermutationSamplerTest.java
+++ b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/PermutationSamplerTest.java
@@ -40,7 +40,7 @@ class PermutationSamplerTest {
final PermutationSampler sampler = new PermutationSampler(RandomSource.KISS.create(),
n, k);
final int[] random = sampler.sample();
- SAMPLE: for (int s : random) {
+ SAMPLE: for (final int s : random) {
for (int i = 0; i < n; i++) {
if (i == s) {
continue SAMPLE;
diff --git a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/JDKRandomBridgeTest.java b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/JDKRandomBridgeTest.java
index 76bab16e..f3ef9314 100644
--- a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/JDKRandomBridgeTest.java
+++ b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/JDKRandomBridgeTest.java
@@ -54,13 +54,13 @@ class JDKRandomBridgeTest {
final Random rng = new JDKRandomBridge(RandomSource.SPLIT_MIX_64, seed);
// Serialize.
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(rng);
// Retrieve from serialized stream.
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
+ final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bis);
final Random serialRng = (Random) (ois.readObject());
// Check that the serialized data recreated the original state.
diff --git a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersCommonParametricTest.java b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersCommonParametricTest.java
index d32de81f..1d1dcaf5 100644
--- a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersCommonParametricTest.java
+++ b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersCommonParametricTest.java
@@ -111,8 +111,8 @@ class ProvidersCommonParametricTest {
final Object[] originalArgs = data.getArgs();
if (originalArgs == null) {
// Try passing arguments to a provider that does not require them
- int arg1 = 123;
- double arg2 = 456.0;
+ final int arg1 = 123;
+ final double arg2 = 456.0;
Assertions.assertThrows(IllegalArgumentException.class,
() -> originalSource.create(arg1, arg2),
() -> "Source does not require arguments: " + originalSource);
@@ -145,7 +145,7 @@ class ProvidersCommonParametricTest {
int nonNativeSeedCount = 0;
int seedCount = 0;
- for (Object s : seeds) {
+ for (final Object s : seeds) {
++seedCount;
if (originalSource.isNativeSeed(s)) {
Assertions.assertNotNull(s, "Identified native seed is null");
@@ -291,7 +291,7 @@ class ProvidersCommonParametricTest {
final RestorableUniformRandomProvider restorable = (RestorableUniformRandomProvider) rng1;
// Cast must fail.
Assertions.assertThrows(ClassCastException.class, () -> {
- RestorableUniformRandomProvider dummy = (RestorableUniformRandomProvider) rng2;
+ final RestorableUniformRandomProvider dummy = (RestorableUniformRandomProvider) rng2;
});
}
@@ -311,8 +311,8 @@ class ProvidersCommonParametricTest {
// Save.
final RandomProviderState stateOrig = restorable.saveState();
// Serialize.
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(((RandomProviderDefaultState) stateOrig).getState());
// Store some values.
@@ -324,8 +324,8 @@ class ProvidersCommonParametricTest {
Assertions.assertNotEquals(listOrig, listDiscard);
// Retrieve from serialized stream.
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
+ final ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ final ObjectInputStream ois = new ObjectInputStream(bis);
final RandomProviderState stateNew = new RandomProviderDefaultState((byte[]) ois.readObject());
Assertions.assertNotSame(stateOrig, stateNew);
@@ -499,7 +499,7 @@ class ProvidersCommonParametricTest {
++numFailures;
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Should never happen.
throw new RuntimeException("Unexpected", e);
}
diff --git a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersList.java b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersList.java
index cf9d1ee1..d09a98b8 100644
--- a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersList.java
+++ b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/ProvidersList.java
@@ -105,7 +105,7 @@ public final class ProvidersList {
// Complete list.
LIST.addAll(LIST32);
LIST.addAll(LIST64);
- } catch (Exception e) {
+ } catch (final Exception e) {
// CHECKSTYLE: stop Regexp
System.err.println("Unexpected exception while creating the list of generators: " + e);
e.printStackTrace(System.err);
diff --git a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/RandomSourceTest.java b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/RandomSourceTest.java
index 1fa09f59..dd69cb31 100644
--- a/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/RandomSourceTest.java
+++ b/commons-rng-simple/src/test/java/org/apache/commons/rng/simple/RandomSourceTest.java
@@ -149,7 +149,7 @@ class RandomSourceTest {
// Cast must fail.
Assertions.assertThrows(ClassCastException.class, () -> {
@SuppressWarnings("unused")
- RestorableUniformRandomProvider dummy = (RestorableUniformRandomProvider) rng2;
+ final RestorableUniformRandomProvider dummy = (RestorableUniformRandomProvider) rng2;
});
}