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 2019/06/06 08:00:19 UTC
[commons-rng] 06/11: RNG-75: Removed check that create/convert seed
returns native type.
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 730b217ab8ccb86032d46d9eba4bb087c2fd3f6e
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Sat Jun 1 21:31:06 2019 +0100
RNG-75: Removed check that create/convert seed returns native type.
---
.../rng/simple/internal/ProviderBuilder.java | 30 +++-------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
index b0d470d..c44513c 100644
--- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
+++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
@@ -568,7 +568,6 @@ public final class ProviderBuilder {
RestorableUniformRandomProvider create() {
// Create a seed.
final Object nativeSeed = createSeed();
- checkSeed(nativeSeed);
// Instantiate.
return create(getConstructor(), new Object[] {nativeSeed});
}
@@ -586,7 +585,6 @@ public final class ProviderBuilder {
RestorableUniformRandomProvider create(Object seed) {
// Convert seed to native type.
final Object nativeSeed = convertSeed(seed);
- checkSeed(nativeSeed);
// Instantiate.
return create(getConstructor(), new Object[] {nativeSeed});
}
@@ -648,31 +646,9 @@ public final class ProviderBuilder {
* @throw UnsupportedOperationException if the {@code seed} type cannot be converted.
*/
private Object createNativeSeed(Object seed) {
- // Convert to native type.
- Object nativeSeed;
-
- if (seed == null) {
- nativeSeed = createSeed();
- } else {
- nativeSeed = convertSeed(seed);
- }
-
- checkSeed(nativeSeed);
-
- return nativeSeed;
- }
-
- /**
- * Check the seed is a native seed.
- *
- * @param seed the seed
- * @throws IllegalStateException if not a native seed.
- */
- private void checkSeed(Object seed) {
- if (!isNativeSeed(seed)) {
- // Conversion setup is wrong.
- throw new IllegalStateException(INTERNAL_ERROR_MSG);
- }
+ return seed == null ?
+ createSeed() :
+ convertSeed(seed);
}
/**