diff options
| author | Camilo Diaz Repka <camilojdiaz@gmail.com> | 2016-03-29 23:18:05 -0400 |
|---|---|---|
| committer | Camilo Diaz Repka <camilojdiaz@gmail.com> | 2016-03-29 23:18:05 -0400 |
| commit | 7be11a36cdfb87201b205341b28a91872533443c (patch) | |
| tree | b2372b01af22d45f9afd46b108ea6bd8cb98dfe3 /core/src | |
| parent | aa583c40649d691c98a8186bb396fa2c0e9153b8 (diff) | |
Refactor: replace all ocurrences of ESTestCase.getRandom() for random().
Remove getRandom().
Diffstat (limited to 'core/src')
76 files changed, 176 insertions, 176 deletions
diff --git a/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java b/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java index 725bafbdfd..3b9671d195 100644 --- a/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java +++ b/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java @@ -44,7 +44,7 @@ public class MinDocQueryTests extends ESTestCase { final int numDocs = randomIntBetween(10, 200); final Document doc = new Document(); final Directory dir = newDirectory(); - final RandomIndexWriter w = new RandomIndexWriter(getRandom(), dir); + final RandomIndexWriter w = new RandomIndexWriter(random(), dir); for (int i = 0; i < numDocs; ++i) { w.addDocument(doc); } diff --git a/core/src/test/java/org/elasticsearch/ESExceptionTests.java b/core/src/test/java/org/elasticsearch/ESExceptionTests.java index ad3f063201..55b8c3ed4e 100644 --- a/core/src/test/java/org/elasticsearch/ESExceptionTests.java +++ b/core/src/test/java/org/elasticsearch/ESExceptionTests.java @@ -339,9 +339,9 @@ public class ESExceptionTests extends ESTestCase { } assertArrayEquals(e.getStackTrace(), ex.getStackTrace()); assertTrue(e.getStackTrace().length > 1); - ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(getRandom()), t); - ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(getRandom()), ex); - ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(getRandom()), e); + ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(random()), t); + ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(random()), ex); + ElasticsearchAssertions.assertVersionSerializable(VersionUtils.randomVersion(random()), e); } } } diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java index 69e41910ff..e5cabd417b 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java @@ -203,7 +203,7 @@ public class BulkProcessorIT extends ESIntegTestCase { //let's make sure that the bulk action limit trips, one single execution will index all the documents .setConcurrentRequests(randomIntBetween(0, 1)).setBulkActions(numDocs) .setFlushInterval(TimeValue.timeValueHours(24)).setBulkSize(new ByteSizeValue(randomIntBetween(1, 10), - RandomPicks.randomFrom(getRandom(), ByteSizeUnit.values()))) + RandomPicks.randomFrom(random(), ByteSizeUnit.values()))) .build(); MultiGetRequestBuilder multiGetRequestBuilder = indexDocs(client(), processor, numDocs); diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java index 3ad343e246..ff1a24d690 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java @@ -26,7 +26,7 @@ import static org.apache.lucene.util.TestUtil.randomSimpleString; public class BulkShardRequestTests extends ESTestCase { public void testToString() { - String index = randomSimpleString(getRandom(), 10); + String index = randomSimpleString(random(), 10); int count = between(1, 100); BulkShardRequest r = new BulkShardRequest(null, new ShardId(index, "ignored", 0), false, new BulkItemRequest[count]); assertEquals("BulkShardRequest to [" + index + "] containing [" + count + "] requests", r.toString()); diff --git a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java index 9ea9b340c2..40995ff778 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java @@ -70,7 +70,7 @@ public class BasicAnalysisBackwardCompatibilityIT extends ESBackcompatTestCase { // cause differences when the random string generated contains these complex characters. To mitigate // the problem, we skip any strings containing these characters. // TODO: only skip strings containing complex chars when comparing against ES <= 1.3.x - input = TestUtil.randomAnalysisString(getRandom(), 100, false); + input = TestUtil.randomAnalysisString(random(), 100, false); matcher = complexUnicodeChars.matcher(input); } while (matcher.find()); @@ -104,7 +104,7 @@ public class BasicAnalysisBackwardCompatibilityIT extends ESBackcompatTestCase { } private String randomAnalyzer() { - PreBuiltAnalyzers preBuiltAnalyzers = RandomPicks.randomFrom(getRandom(), PreBuiltAnalyzers.values()); + PreBuiltAnalyzers preBuiltAnalyzers = RandomPicks.randomFrom(random(), PreBuiltAnalyzers.values()); return preBuiltAnalyzers.name().toLowerCase(Locale.ROOT); } diff --git a/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java index ae73970159..c26da0e6f1 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java @@ -319,7 +319,7 @@ public class BasicBackwardsCompatibilityIT extends ESBackcompatTestCase { IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; String[] indexForDoc = new String[docs.length]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex(indexForDoc[i] = RandomPicks.randomFrom(getRandom(), indices), "type1", String.valueOf(i)).setSource("field1", English.intToEnglish(i), "num_int", randomInt(), "num_double", randomDouble()); + docs[i] = client().prepareIndex(indexForDoc[i] = RandomPicks.randomFrom(random(), indices), "type1", String.valueOf(i)).setSource("field1", English.intToEnglish(i), "num_int", randomInt(), "num_double", randomDouble()); } indexRandom(true, docs); for (String index : indices) { diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index 1c9e607f36..0246ec227d 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -63,7 +63,7 @@ public class TransportClientNodesServiceTests extends ESTestCase { TestIteration() { threadPool = new ThreadPool("transport-client-nodes-service-tests"); - transport = new FailAndRetryMockTransport<TestResponse>(getRandom()) { + transport = new FailAndRetryMockTransport<TestResponse>(random()) { @Override public List<String> getLocalAddresses() { return Collections.emptyList(); diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java index 0745bd3880..017537443a 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java @@ -492,7 +492,7 @@ public class ClusterStateDiffIT extends ESIntegTestCase { public IndexMetaData randomCreate(String name) { IndexMetaData.Builder builder = IndexMetaData.builder(name); Settings.Builder settingsBuilder = Settings.builder(); - setRandomIndexSettings(getRandom(), settingsBuilder); + setRandomIndexSettings(random(), settingsBuilder); settingsBuilder.put(randomSettings(Settings.EMPTY)).put(IndexMetaData.SETTING_VERSION_CREATED, randomVersion(random())); builder.settings(settingsBuilder); builder.numberOfShards(randomIntBetween(1, 10)).numberOfReplicas(randomInt(10)); @@ -672,6 +672,6 @@ public class ClusterStateDiffIT extends ESIntegTestCase { * Generates a random name that starts with the given prefix */ private String randomName(String prefix) { - return prefix + Strings.randomBase64UUID(getRandom()); + return prefix + Strings.randomBase64UUID(random()); } } diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java index ba73181ad9..5c91c80f29 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java @@ -72,7 +72,7 @@ public class UnassignedInfoTests extends ESAllocationTestCase { } public void testSerialization() throws Exception { - UnassignedInfo meta = new UnassignedInfo(RandomPicks.randomFrom(getRandom(), UnassignedInfo.Reason.values()), randomBoolean() ? randomAsciiOfLength(4) : null); + UnassignedInfo meta = new UnassignedInfo(RandomPicks.randomFrom(random(), UnassignedInfo.Reason.values()), randomBoolean() ? randomAsciiOfLength(4) : null); BytesStreamOutput out = new BytesStreamOutput(); meta.writeTo(out); out.close(); @@ -273,7 +273,7 @@ public class UnassignedInfoTests extends ESAllocationTestCase { public void testUnassignedDelayOnlyNodeLeftNonNodeLeftReason() throws Exception { EnumSet<UnassignedInfo.Reason> reasons = EnumSet.allOf(UnassignedInfo.Reason.class); reasons.remove(UnassignedInfo.Reason.NODE_LEFT); - UnassignedInfo unassignedInfo = new UnassignedInfo(RandomPicks.randomFrom(getRandom(), reasons), null); + UnassignedInfo unassignedInfo = new UnassignedInfo(RandomPicks.randomFrom(random(), reasons), null); long delay = unassignedInfo.updateDelay(unassignedInfo.getUnassignedTimeInNanos() + 1, // add 1 tick delay Settings.builder().put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "10h").build(), Settings.EMPTY); assertThat(delay, equalTo(0L)); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index f1495bb5e7..53a88d333c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -313,7 +313,7 @@ public class BalanceConfigurationTests extends ESAllocationTestCase { public void testNoRebalanceOnPrimaryOverload() { Settings.Builder settings = settingsBuilder(); AllocationService strategy = new AllocationService(settings.build(), randomAllocationDeciders(settings.build(), - new ClusterSettings(Settings.Builder.EMPTY_SETTINGS, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS), getRandom()), + new ClusterSettings(Settings.Builder.EMPTY_SETTINGS, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS), random()), NoopGatewayAllocator.INSTANCE, new ShardsAllocator() { public Map<DiscoveryNode, Float> weighShard(RoutingAllocation allocation, ShardRouting shard) { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index 0bdab7a115..582fcfd52c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java @@ -56,7 +56,7 @@ public class RandomAllocationDeciderTests extends ESAllocationTestCase { * already allocated on a node and balances the cluster to gain optimal * balance.*/ public void testRandomDecisions() { - RandomAllocationDecider randomAllocationDecider = new RandomAllocationDecider(getRandom()); + RandomAllocationDecider randomAllocationDecider = new RandomAllocationDecider(random()); AllocationService strategy = new AllocationService(settingsBuilder().build(), new AllocationDeciders(Settings.EMPTY, new HashSet<>(Arrays.asList(new SameShardAllocationDecider(Settings.EMPTY), new ReplicaAfterPrimaryActiveAllocationDecider(Settings.EMPTY), randomAllocationDecider))), NoopGatewayAllocator.INSTANCE, new BalancedShardsAllocator(Settings.EMPTY), EmptyClusterInfoService.INSTANCE); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java index bd1738b59b..f42920551f 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java @@ -155,14 +155,14 @@ public class EnableAllocationTests extends ESAllocationTestCase { public void testEnableClusterBalance() { final boolean useClusterSetting = randomBoolean(); - final Rebalance allowedOnes = RandomPicks.randomFrom(getRandom(), EnumSet.of(Rebalance.PRIMARIES, Rebalance.REPLICAS, Rebalance.ALL)); + final Rebalance allowedOnes = RandomPicks.randomFrom(random(), EnumSet.of(Rebalance.PRIMARIES, Rebalance.REPLICAS, Rebalance.ALL)); Settings build = settingsBuilder() - .put(CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), useClusterSetting ? Rebalance.NONE: RandomPicks.randomFrom(getRandom(), Rebalance.values())) // index settings override cluster settings + .put(CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), useClusterSetting ? Rebalance.NONE: RandomPicks.randomFrom(random(), Rebalance.values())) // index settings override cluster settings .put(ConcurrentRebalanceAllocationDecider.CLUSTER_ROUTING_ALLOCATION_CLUSTER_CONCURRENT_REBALANCE_SETTING.getKey(), 3) .put(ThrottlingAllocationDecider.CLUSTER_ROUTING_ALLOCATION_NODE_CONCURRENT_OUTGOING_RECOVERIES_SETTING.getKey(), 10) .build(); ClusterSettings clusterSettings = new ClusterSettings(build, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); - AllocationService strategy = createAllocationService(build, clusterSettings, getRandom()); + AllocationService strategy = createAllocationService(build, clusterSettings, random()); Settings indexSettings = useClusterSetting ? Settings.EMPTY : settingsBuilder().put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), Rebalance.NONE).build(); logger.info("Building initial routing table"); @@ -260,11 +260,11 @@ public class EnableAllocationTests extends ESAllocationTestCase { public void testEnableClusterBalanceNoReplicas() { final boolean useClusterSetting = randomBoolean(); Settings build = settingsBuilder() - .put(CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), useClusterSetting ? Rebalance.NONE: RandomPicks.randomFrom(getRandom(), Rebalance.values())) // index settings override cluster settings + .put(CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), useClusterSetting ? Rebalance.NONE: RandomPicks.randomFrom(random(), Rebalance.values())) // index settings override cluster settings .put(ConcurrentRebalanceAllocationDecider.CLUSTER_ROUTING_ALLOCATION_CLUSTER_CONCURRENT_REBALANCE_SETTING.getKey(), 3) .build(); ClusterSettings clusterSettings = new ClusterSettings(build, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); - AllocationService strategy = createAllocationService(build, clusterSettings, getRandom()); + AllocationService strategy = createAllocationService(build, clusterSettings, random()); Settings indexSettings = useClusterSetting ? Settings.EMPTY : settingsBuilder().put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), Rebalance.NONE).build(); logger.info("Building initial routing table"); diff --git a/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java b/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java index b18e6f62d2..60f4983dd1 100644 --- a/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java +++ b/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java @@ -30,10 +30,10 @@ public class BytesReferenceTests extends ESTestCase { final int len = randomIntBetween(0, randomBoolean() ? 10: 100000); final int offset1 = randomInt(5); final byte[] array1 = new byte[offset1 + len + randomInt(5)]; - getRandom().nextBytes(array1); + random().nextBytes(array1); final int offset2 = randomInt(offset1); final byte[] array2 = Arrays.copyOfRange(array1, offset1 - offset2, array1.length); - + final BytesArray b1 = new BytesArray(array1, offset1, len); final BytesArray b2 = new BytesArray(array2, offset2, len); assertTrue(BytesReference.Helper.bytesEqual(b1, b2)); diff --git a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java index 7b34685da7..90b253ec44 100644 --- a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java +++ b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java @@ -115,7 +115,7 @@ public class PagedBytesReferenceTests extends ESTestCase { // buffer for bulk reads byte[] origBuf = new byte[length]; - getRandom().nextBytes(origBuf); + random().nextBytes(origBuf); byte[] targetBuf = Arrays.copyOf(origBuf, origBuf.length); // bulk-read 0 bytes: must not modify buffer @@ -172,7 +172,7 @@ public class PagedBytesReferenceTests extends ESTestCase { byte[] pbrBytesWithOffset = Arrays.copyOfRange(pbr.toBytes(), offset, length); // randomized target buffer to ensure no stale slots byte[] targetBytes = new byte[pbrBytesWithOffset.length]; - getRandom().nextBytes(targetBytes); + random().nextBytes(targetBytes); // bulk-read all si.readFully(targetBytes); @@ -574,7 +574,7 @@ public class PagedBytesReferenceTests extends ESTestCase { ReleasableBytesStreamOutput out = new ReleasableBytesStreamOutput(length, bigarrays); try { for (int i = 0; i < length; i++) { - out.writeByte((byte) getRandom().nextInt(1 << 8)); + out.writeByte((byte) random().nextInt(1 << 8)); } } catch (IOException e) { fail("should not happen " + e.getMessage()); diff --git a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTestCase.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTestCase.java index 88f152725d..0e94f6eaf8 100644 --- a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTestCase.java +++ b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTestCase.java @@ -46,7 +46,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRandom() throws IOException { - Random r = getRandom(); + Random r = random(); for (int i = 0; i < 10; i++) { byte bytes[] = new byte[TestUtil.nextInt(r, 1, 100000)]; r.nextBytes(bytes); @@ -55,7 +55,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRandomThreads() throws Exception { - final Random r = getRandom(); + final Random r = random(); int threadCount = TestUtil.nextInt(r, 2, 6); Thread[] threads = new Thread[threadCount]; final CountDownLatch startingGun = new CountDownLatch(1); @@ -86,7 +86,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testLineDocs() throws IOException { - Random r = getRandom(); + Random r = random(); LineFileDocs lineFileDocs = new LineFileDocs(r); for (int i = 0; i < 10; i++) { int numDocs = TestUtil.nextInt(r, 1, 200); @@ -101,7 +101,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testLineDocsThreads() throws Exception { - final Random r = getRandom(); + final Random r = random(); int threadCount = TestUtil.nextInt(r, 2, 6); Thread[] threads = new Thread[threadCount]; final CountDownLatch startingGun = new CountDownLatch(1); @@ -138,7 +138,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsL() throws IOException { - Random r = getRandom(); + Random r = random(); for (int i = 0; i < 10; i++) { int numLongs = TestUtil.nextInt(r, 1, 10000); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -161,7 +161,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsLThreads() throws Exception { - final Random r = getRandom(); + final Random r = random(); int threadCount = TestUtil.nextInt(r, 2, 6); Thread[] threads = new Thread[threadCount]; final CountDownLatch startingGun = new CountDownLatch(1); @@ -206,7 +206,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsI() throws IOException { - Random r = getRandom(); + Random r = random(); for (int i = 0; i < 10; i++) { int numInts = TestUtil.nextInt(r, 1, 20000); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -225,7 +225,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsIThreads() throws Exception { - final Random r = getRandom(); + final Random r = random(); int threadCount = TestUtil.nextInt(r, 2, 6); Thread[] threads = new Thread[threadCount]; final CountDownLatch startingGun = new CountDownLatch(1); @@ -266,7 +266,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsS() throws IOException { - Random r = getRandom(); + Random r = random(); for (int i = 0; i < 10; i++) { int numShorts = TestUtil.nextInt(r, 1, 40000); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -283,7 +283,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testMixed() throws IOException { - Random r = getRandom(); + Random r = random(); LineFileDocs lineFileDocs = new LineFileDocs(r); for (int i = 0; i < 2; ++i) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -349,7 +349,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { } public void testRepetitionsSThreads() throws Exception { - final Random r = getRandom(); + final Random r = random(); int threadCount = TestUtil.nextInt(r, 2, 6); Thread[] threads = new Thread[threadCount]; final CountDownLatch startingGun = new CountDownLatch(1); @@ -396,8 +396,8 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { OutputStreamStreamOutput rawOs = new OutputStreamStreamOutput(bos); StreamOutput os = c.streamOutput(rawOs); - Random r = getRandom(); - int bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(getRandom(), 1, 70000); + Random r = random(); + int bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(random(), 1, 70000); int prepadding = r.nextInt(70000); int postpadding = r.nextInt(70000); byte buffer[] = new byte[prepadding + bufferSize + postpadding]; @@ -417,7 +417,7 @@ public abstract class AbstractCompressedStreamTestCase extends ESTestCase { StreamInput in = c.streamInput(compressedIn); // randomize constants again - bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(getRandom(), 1, 70000); + bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(random(), 1, 70000); prepadding = r.nextInt(70000); postpadding = r.nextInt(70000); buffer = new byte[prepadding + bufferSize + postpadding]; diff --git a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTestCase.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTestCase.java index e5d627f35b..d1c862f8a6 100644 --- a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTestCase.java +++ b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTestCase.java @@ -72,7 +72,7 @@ public abstract class AbstractCompressedXContentTestCase extends ESTestCase { Compressor defaultCompressor = CompressorFactory.defaultCompressor(); try { CompressorFactory.setDefaultCompressor(compressor); - Random r = getRandom(); + Random r = random(); for (int i = 0; i < 1000; i++) { String string = TestUtil.randomUnicodeString(r, 10000); // hack to make it detected as YAML diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java index c2730f91df..b5fe3222b7 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java @@ -72,7 +72,7 @@ public class EnvelopeBuilderTests extends AbstractShapeBuilderTestCase<EnvelopeB } static EnvelopeBuilder createRandomShape() { - Rectangle box = RandomShapeGenerator.xRandomRectangle(getRandom(), RandomShapeGenerator.xRandomPoint(getRandom())); + Rectangle box = RandomShapeGenerator.xRandomRectangle(random(), RandomShapeGenerator.xRandomPoint(random())); EnvelopeBuilder envelope = new EnvelopeBuilder(new Coordinate(box.getMinX(), box.getMaxY()), new Coordinate(box.getMaxX(), box.getMinY())); return envelope; diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java index e53715b0ec..c0ada3725b 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java @@ -100,7 +100,7 @@ public class GeometryCollectionBuilderTests extends AbstractShapeBuilderTestCase } mutation.shapes.set(shapePosition, shapeToChange); } else { - mutation.shape(RandomShapeGenerator.createShape(getRandom())); + mutation.shape(RandomShapeGenerator.createShape(random())); } return mutation; } diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java index e96c35287c..be7772b0da 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java @@ -69,7 +69,7 @@ public class LineStringBuilderTests extends AbstractShapeBuilderTestCase<LineStr } static LineStringBuilder createRandomShape() { - LineStringBuilder lsb = (LineStringBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.LINESTRING); + LineStringBuilder lsb = (LineStringBuilder) RandomShapeGenerator.createShape(random(), ShapeType.LINESTRING); if (randomBoolean()) { lsb.close(); } diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java index 925d177c57..9fbaed815b 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java @@ -62,7 +62,7 @@ public class MultiLineStringBuilderTests extends AbstractShapeBuilderTestCase<Mu } } } else { - mutation.linestring((LineStringBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.LINESTRING)); + mutation.linestring((LineStringBuilder) RandomShapeGenerator.createShape(random(), ShapeType.LINESTRING)); } return mutation; } diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java index ec2eb50bd3..14c1acc8c6 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java @@ -74,6 +74,6 @@ public class MultiPointBuilderTests extends AbstractShapeBuilderTestCase<MultiPo } static MultiPointBuilder createRandomShape() { - return (MultiPointBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.MULTIPOINT); + return (MultiPointBuilder) RandomShapeGenerator.createShape(random(), ShapeType.MULTIPOINT); } } diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java index 702114a2cb..756f1bcdc7 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java @@ -50,7 +50,7 @@ public class MultiPolygonBuilderTests extends AbstractShapeBuilderTestCase<Multi int polyToChange = randomInt(mutation.polygons().size() - 1); mutation.polygons().set(polyToChange, PolygonBuilderTests.mutatePolygonBuilder(mutation.polygons().get(polyToChange))); } else { - mutation.polygon((PolygonBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.POLYGON)); + mutation.polygon((PolygonBuilder) RandomShapeGenerator.createShape(random(), ShapeType.POLYGON)); } } return mutation; @@ -60,7 +60,7 @@ public class MultiPolygonBuilderTests extends AbstractShapeBuilderTestCase<Multi MultiPolygonBuilder mpb = new MultiPolygonBuilder(randomFrom(Orientation.values())); int polys = randomIntBetween(0, 10); for (int i = 0; i < polys; i++) { - PolygonBuilder pgb = (PolygonBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.POLYGON); + PolygonBuilder pgb = (PolygonBuilder) RandomShapeGenerator.createShape(random(), ShapeType.POLYGON); mpb.polygon(pgb); } return mpb; diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java index ba3f808d24..bf2a7da910 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java @@ -42,7 +42,7 @@ public class PointBuilderTests extends AbstractShapeBuilderTestCase<PointBuilder } static PointBuilder createRandomShape() { - return (PointBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.POINT); + return (PointBuilder) RandomShapeGenerator.createShape(random(), ShapeType.POINT); } diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java index 9a35690f94..04122229bc 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java @@ -89,7 +89,7 @@ public class PolygonBuilderTests extends AbstractShapeBuilderTestCase<PolygonBui } static PolygonBuilder createRandomShape() { - PolygonBuilder pgb = (PolygonBuilder) RandomShapeGenerator.createShape(getRandom(), ShapeType.POLYGON); + PolygonBuilder pgb = (PolygonBuilder) RandomShapeGenerator.createShape(random(), ShapeType.POLYGON); if (randomBoolean()) { pgb = polyWithOposingOrientation(pgb); } diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index 8099a29194..230997d027 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -495,7 +495,7 @@ public class BytesStreamsTests extends ESTestCase { // create & fill byte[] with randomized data protected byte[] randomizedByteArrayWithSize(int size) { byte[] data = new byte[size]; - getRandom().nextBytes(data); + random().nextBytes(data); return data; } diff --git a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java index 8df6f5c78c..224a3cf6c8 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java @@ -324,7 +324,7 @@ public class LuceneTests extends ESTestCase { public void testCount() throws Exception { Directory dir = newDirectory(); - RandomIndexWriter w = new RandomIndexWriter(getRandom(), dir); + RandomIndexWriter w = new RandomIndexWriter(random(), dir); try (DirectoryReader reader = w.getReader()) { // match_all does not match anything on an empty index diff --git a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java b/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java index b48654ae7c..8bd0e3c652 100644 --- a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java +++ b/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java @@ -106,7 +106,7 @@ public abstract class AbstractRecyclerTestCase extends ESTestCase { Recycler<byte[]> r = newRecycler(limit); Recycler.V<byte[]> o = r.obtain(); assertFresh(o.v()); - getRandom().nextBytes(o.v()); + random().nextBytes(o.v()); o.close(); o = r.obtain(); assertRecycled(o.v()); @@ -166,7 +166,7 @@ public abstract class AbstractRecyclerTestCase extends ESTestCase { assertFresh(data); // randomize & return to pool - getRandom().nextBytes(data); + random().nextBytes(data); o.close(); // verify that recycle() ran diff --git a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java index 85c2be77af..033b4f4ad6 100644 --- a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java +++ b/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java @@ -31,7 +31,7 @@ public class RegexTests extends ESTestCase { "LITERAL", "COMMENTS", "UNICODE_CHAR_CLASS", "UNICODE_CHARACTER_CLASS"}; int[] flags = new int[]{Pattern.CASE_INSENSITIVE, Pattern.MULTILINE, Pattern.DOTALL, Pattern.UNICODE_CASE, Pattern.CANON_EQ, Pattern.UNIX_LINES, Pattern.LITERAL, Pattern.COMMENTS, Regex.UNICODE_CHARACTER_CLASS}; - Random random = getRandom(); + Random random = random(); int num = 10 + random.nextInt(100); for (int i = 0; i < num; i++) { int numFlags = random.nextInt(flags.length + 1); @@ -63,4 +63,4 @@ public class RegexTests extends ESTestCase { assertTrue(Regex.simpleMatch("fff*******ddd", "fffabcddd")); assertFalse(Regex.simpleMatch("fff******ddd", "fffabcdd")); } -}
\ No newline at end of file +} diff --git a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java index 1735515bf3..3192c8242b 100644 --- a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java @@ -235,7 +235,7 @@ public class BigArraysTests extends ESSingleNodeTestCase { public void testByteArrayBulkGet() { final byte[] array1 = new byte[randomIntBetween(1, 4000000)]; - getRandom().nextBytes(array1); + random().nextBytes(array1); final ByteArray array2 = bigArrays.newByteArray(array1.length, randomBoolean()); for (int i = 0; i < array1.length; ++i) { array2.set(i, array1[i]); @@ -252,7 +252,7 @@ public class BigArraysTests extends ESSingleNodeTestCase { public void testByteArrayBulkSet() { final byte[] array1 = new byte[randomIntBetween(1, 4000000)]; - getRandom().nextBytes(array1); + random().nextBytes(array1); final ByteArray array2 = bigArrays.newByteArray(array1.length, randomBoolean()); for (int i = 0; i < array1.length; ) { final int len = Math.min(array1.length - i, randomBoolean() ? randomInt(10) : randomInt(3 * BigArrays.BYTE_PAGE_SIZE)); @@ -315,7 +315,7 @@ public class BigArraysTests extends ESSingleNodeTestCase { // large arrays should be different final byte[] array1 = new byte[randomIntBetween(1, 4000000)]; - getRandom().nextBytes(array1); + random().nextBytes(array1); final int array1Hash = Arrays.hashCode(array1); final ByteArray array2 = byteArrayWithBytes(array1); final int array2Hash = bigArrays.hashCode(array2); diff --git a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java b/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java index 01c27a65ab..8b0051228b 100644 --- a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java @@ -110,7 +110,7 @@ public class BytesRefHashTests extends ESSingleNodeTestCase { for (int i = 0; i < 797; i++) { String str; do { - str = TestUtil.randomRealisticUnicodeString(getRandom(), 1000); + str = TestUtil.randomRealisticUnicodeString(random(), 1000); } while (str.length() == 0); ref.copyChars(str); long count = hash.size(); @@ -142,7 +142,7 @@ public class BytesRefHashTests extends ESSingleNodeTestCase { for (int i = 0; i < 797; i++) { String str; do { - str = TestUtil.randomRealisticUnicodeString(getRandom(), 1000); + str = TestUtil.randomRealisticUnicodeString(random(), 1000); } while (str.length() == 0); ref.copyChars(str); long count = hash.size(); @@ -181,7 +181,7 @@ public class BytesRefHashTests extends ESSingleNodeTestCase { for (int i = 0; i < 797; i++) { String str; do { - str = TestUtil.randomRealisticUnicodeString(getRandom(), 1000); + str = TestUtil.randomRealisticUnicodeString(random(), 1000); } while (str.length() == 0); ref.copyChars(str); long count = hash.size(); @@ -216,7 +216,7 @@ public class BytesRefHashTests extends ESSingleNodeTestCase { for (int i = 0; i < 797; i++) { String str; do { - str = TestUtil.randomRealisticUnicodeString(getRandom(), 1000); + str = TestUtil.randomRealisticUnicodeString(random(), 1000); } while (str.length() == 0); ref.copyChars(str); long count = hash.size(); diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java index f588652ac8..2f13167288 100644 --- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java @@ -218,7 +218,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { // Simulate a network issue between the unlucky node and elected master node in both directions. - NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(masterNode, unluckyNode, getRandom()); + NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(masterNode, unluckyNode, random()); setDisruptionScheme(networkDisconnect); networkDisconnect.startDisrupting(); @@ -562,7 +562,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { String oldMasterNode = internalCluster().getMasterName(); // a very long GC, but it's OK as we remove the disruption when it has had an effect - SingleNodeDisruption masterNodeDisruption = new IntermittentLongGCDisruption(oldMasterNode, getRandom(), 100, 200, 30000, 60000); + SingleNodeDisruption masterNodeDisruption = new IntermittentLongGCDisruption(oldMasterNode, random(), 100, 200, 30000, 60000); internalCluster().setDisruptionScheme(masterNodeDisruption); masterNodeDisruption.startDisrupting(); @@ -609,7 +609,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { assertMaster(oldMasterNode, nodes); // Simulating a painful gc by suspending all threads for a long time on the current elected master node. - SingleNodeDisruption masterNodeDisruption = new LongGCDisruption(getRandom(), oldMasterNode); + SingleNodeDisruption masterNodeDisruption = new LongGCDisruption(random(), oldMasterNode); // Save the majority side final List<String> majoritySide = new ArrayList<>(nodes); @@ -779,7 +779,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { } // Simulate a network issue between the unlucky node and elected master node in both directions. - NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(masterNode, isolatedNode, getRandom()); + NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(masterNode, isolatedNode, random()); setDisruptionScheme(networkDisconnect); networkDisconnect.startDisrupting(); // Wait until elected master has removed that the unlucky node... @@ -816,7 +816,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { } // Simulate a network issue between the unicast target node and the rest of the cluster - NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(unicastTargetSide, restOfClusterSide, getRandom()); + NetworkDisconnectPartition networkDisconnect = new NetworkDisconnectPartition(unicastTargetSide, restOfClusterSide, random()); setDisruptionScheme(networkDisconnect); networkDisconnect.startDisrupting(); // Wait until elected master has removed that the unlucky node... @@ -955,7 +955,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { public void testClusterFormingWithASlowNode() throws Exception { configureUnicastCluster(3, null, 2); - SlowClusterStateProcessing disruption = new SlowClusterStateProcessing(getRandom(), 0, 0, 1000, 2000); + SlowClusterStateProcessing disruption = new SlowClusterStateProcessing(random(), 0, 0, 1000, 2000); // don't wait for initial state, wat want to add the disruption while the cluster is forming.. internalCluster().startNodesAsync(3, @@ -1035,7 +1035,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { indexRequestBuilderList.add(client().prepareIndex().setIndex("test").setType("doc").setSource("{\"int_field\":1}")); } indexRandom(true, indexRequestBuilderList); - SingleNodeDisruption disruption = new BlockClusterStateProcessing(node_2, getRandom()); + SingleNodeDisruption disruption = new BlockClusterStateProcessing(node_2, random()); internalCluster().setDisruptionScheme(disruption); MockTransportService transportServiceNode2 = (MockTransportService) internalCluster().getInstance(TransportService.class, node_2); @@ -1095,7 +1095,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { ensureYellow(); final String masterNode1 = internalCluster().getMasterName(); - NetworkPartition networkPartition = new NetworkUnresponsivePartition(masterNode1, dataNode.get(), getRandom()); + NetworkPartition networkPartition = new NetworkUnresponsivePartition(masterNode1, dataNode.get(), random()); internalCluster().setDisruptionScheme(networkPartition); networkPartition.startDisrupting(); // We know this will time out due to the partition, we check manually below to not proceed until @@ -1117,9 +1117,9 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { protected NetworkPartition addRandomPartition() { NetworkPartition partition; if (randomBoolean()) { - partition = new NetworkUnresponsivePartition(getRandom()); + partition = new NetworkUnresponsivePartition(random()); } else { - partition = new NetworkDisconnectPartition(getRandom()); + partition = new NetworkDisconnectPartition(random()); } setDisruptionScheme(partition); @@ -1135,9 +1135,9 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { NetworkPartition partition; if (randomBoolean()) { - partition = new NetworkUnresponsivePartition(side1, side2, getRandom()); + partition = new NetworkUnresponsivePartition(side1, side2, random()); } else { - partition = new NetworkDisconnectPartition(side1, side2, getRandom()); + partition = new NetworkDisconnectPartition(side1, side2, random()); } internalCluster().setDisruptionScheme(partition); @@ -1148,10 +1148,10 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { private ServiceDisruptionScheme addRandomDisruptionScheme() { // TODO: add partial partitions List<ServiceDisruptionScheme> list = Arrays.asList( - new NetworkUnresponsivePartition(getRandom()), - new NetworkDelaysPartition(getRandom()), - new NetworkDisconnectPartition(getRandom()), - new SlowClusterStateProcessing(getRandom()) + new NetworkUnresponsivePartition(random()), + new NetworkDelaysPartition(random()), + new NetworkDisconnectPartition(random()), + new SlowClusterStateProcessing(random()) ); Collections.shuffle(list, random()); setDisruptionScheme(list.get(0)); diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java index 115e5b68ff..b2c6f121a1 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java @@ -349,7 +349,7 @@ public class MetaDataStateFormatTests extends ESTestCase { @Override protected Directory newDirectory(Path dir) throws IOException { - MockDirectoryWrapper mock = new MockDirectoryWrapper(getRandom(), super.newDirectory(dir)); + MockDirectoryWrapper mock = new MockDirectoryWrapper(random(), super.newDirectory(dir)); closeAfterSuite(mock); return mock; } diff --git a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java index a4a62a8f5e..7ab136b477 100644 --- a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java @@ -105,7 +105,7 @@ public class ReplicaShardAllocatorTests extends ESAllocationTestCase { * and find a better copy for the shard. */ public void testAsyncFetchOnAnythingButIndexCreation() { - UnassignedInfo.Reason reason = RandomPicks.randomFrom(getRandom(), EnumSet.complementOf(EnumSet.of(UnassignedInfo.Reason.INDEX_CREATED))); + UnassignedInfo.Reason reason = RandomPicks.randomFrom(random(), EnumSet.complementOf(EnumSet.of(UnassignedInfo.Reason.INDEX_CREATED))); RoutingAllocation allocation = onePrimaryOnNode1And1Replica(yesAllocationDeciders(), Settings.EMPTY, reason); testAllocator.clean(); testAllocator.allocateUnassigned(allocation); diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java index f665de6216..3c1e167fb2 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisServiceTests.java @@ -51,7 +51,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testDefaultAnalyzers() throws IOException { - Version version = VersionUtils.randomVersion(getRandom()); + Version version = VersionUtils.randomVersion(random()); Settings settings = Settings .builder() .put(IndexMetaData.SETTING_VERSION_CREATED, version) @@ -65,7 +65,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testOverrideDefaultAnalyzer() throws IOException { - Version version = VersionUtils.randomVersion(getRandom()); + Version version = VersionUtils.randomVersion(random()); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), Collections.singletonMap("default", analyzerProvider("default")), @@ -76,7 +76,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testOverrideDefaultIndexAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), Version.V_5_0_0_alpha1, Version.CURRENT); + Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0_alpha1, Version.CURRENT); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); try { AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), @@ -90,7 +90,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testBackCompatOverrideDefaultIndexAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0_alpha1)); + Version version = VersionUtils.randomVersionBetween(random(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0_alpha1)); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), Collections.singletonMap("default_index", analyzerProvider("default_index")), @@ -101,7 +101,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testOverrideDefaultSearchAnalyzer() { - Version version = VersionUtils.randomVersion(getRandom()); + Version version = VersionUtils.randomVersion(random()); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); AnalysisService analysisService = new AnalysisService(IndexSettingsModule.newIndexSettings("index", settings), Collections.singletonMap("default_search", analyzerProvider("default_search")), @@ -112,7 +112,7 @@ public class AnalysisServiceTests extends ESTestCase { } public void testBackCompatOverrideDefaultIndexAndSearchAnalyzer() { - Version version = VersionUtils.randomVersionBetween(getRandom(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0_alpha1)); + Version version = VersionUtils.randomVersionBetween(random(), VersionUtils.getFirstVersion(), VersionUtils.getPreviousVersion(Version.V_5_0_0_alpha1)); Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); Map<String, AnalyzerProvider> analyzers = new HashMap<>(); analyzers.put("default_index", analyzerProvider("default_index")); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java index a6c4bb15c3..741a1b5452 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java @@ -246,11 +246,11 @@ public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataI // missing value is set to an actual value final String[] values = new String[randomIntBetween(2, 30)]; for (int i = 1; i < values.length; ++i) { - values[i] = TestUtil.randomUnicodeString(getRandom()); + values[i] = TestUtil.randomUnicodeString(random()); } final int numDocs = scaledRandomIntBetween(10, 3072); for (int i = 0; i < numDocs; ++i) { - final String value = RandomPicks.randomFrom(getRandom(), values); + final String value = RandomPicks.randomFrom(random(), values); if (value == null) { writer.addDocument(new Document()); } else { @@ -302,11 +302,11 @@ public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataI public void testSortMissing(boolean first, boolean reverse) throws IOException { final String[] values = new String[randomIntBetween(2, 10)]; for (int i = 1; i < values.length; ++i) { - values[i] = TestUtil.randomUnicodeString(getRandom()); + values[i] = TestUtil.randomUnicodeString(random()); } final int numDocs = scaledRandomIntBetween(10, 3072); for (int i = 0; i < numDocs; ++i) { - final String value = RandomPicks.randomFrom(getRandom(), values); + final String value = RandomPicks.randomFrom(random(), values); if (value == null) { writer.addDocument(new Document()); } else { @@ -355,7 +355,7 @@ public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataI public void testNestedSorting(MultiValueMode sortMode) throws IOException { final String[] values = new String[randomIntBetween(2, 20)]; for (int i = 0; i < values.length; ++i) { - values[i] = TestUtil.randomSimpleString(getRandom()); + values[i] = TestUtil.randomSimpleString(random()); } final int numParents = scaledRandomIntBetween(10, 3072); List<Document> docs = new ArrayList<>(); @@ -367,14 +367,14 @@ public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataI final Document child = new Document(); final int numValues = randomInt(3); for (int k = 0; k < numValues; ++k) { - final String value = RandomPicks.randomFrom(getRandom(), values); + final String value = RandomPicks.randomFrom(random(), values); addField(child, "text", value); } docs.add(child); } final Document parent = new Document(); parent.add(new StringField("type", "parent", Store.YES)); - final String value = RandomPicks.randomFrom(getRandom(), values); + final String value = RandomPicks.randomFrom(random(), values); if (value != null) { addField(parent, "text", value); } @@ -400,10 +400,10 @@ public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataI missingValue = "_last"; break; case 2: - missingValue = new BytesRef(RandomPicks.randomFrom(getRandom(), values)); + missingValue = new BytesRef(RandomPicks.randomFrom(random(), values)); break; default: - missingValue = new BytesRef(TestUtil.randomSimpleString(getRandom())); + missingValue = new BytesRef(TestUtil.randomSimpleString(random())); break; } Query parentFilter = new TermQuery(new Term("type", "parent")); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java index 737d76fec7..5f8beb1242 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java @@ -107,7 +107,7 @@ public class BinaryDVFieldDataTests extends AbstractFieldDataTestCase { private byte[] randomBytes() { int size = randomIntBetween(10, 1000); byte[] bytes = new byte[size]; - getRandom().nextBytes(bytes); + random().nextBytes(bytes); return bytes; } diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java index 14278e1f55..51aad459c1 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java @@ -39,7 +39,7 @@ public class FilterFieldDataTests extends AbstractFieldDataTestCase { } public void testFilterByFrequency() throws Exception { - Random random = getRandom(); + Random random = random(); for (int i = 0; i < 1000; i++) { Document d = new Document(); d.add(new StringField("id", "" + i, Field.Store.NO)); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java index 03cc8776e2..3f1e367952 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java @@ -45,7 +45,7 @@ public class MultiOrdinalsTests extends ESTestCase { } public void testRandomValues() throws IOException { - Random random = getRandom(); + Random random = random(); int numDocs = 100 + random.nextInt(1000); int numOrdinals = 1 + random.nextInt(200); int numValues = 100 + random.nextInt(100000); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java index 74fc98fddb..8ab89e83ec 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java @@ -83,7 +83,7 @@ public class BooleanFieldMapperTests extends ESSingleNodeTestCase { .bytes()); try (Directory dir = new RAMDirectory(); - IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(getRandom())))) { + IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())))) { w.addDocuments(doc.docs()); try (DirectoryReader reader = DirectoryReader.open(w)) { final LeafReader leaf = reader.leaves().get(0).reader(); diff --git a/core/src/test/java/org/elasticsearch/index/query/AbstractQueryTestCase.java b/core/src/test/java/org/elasticsearch/index/query/AbstractQueryTestCase.java index c6577fa4c4..bc45ffc7df 100644 --- a/core/src/test/java/org/elasticsearch/index/query/AbstractQueryTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/query/AbstractQueryTestCase.java @@ -844,7 +844,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> } public static String randomGeohash(int minPrecision, int maxPrecision) { - return geohashGenerator.ofStringLength(getRandom(), minPrecision, maxPrecision); + return geohashGenerator.ofStringLength(random(), minPrecision, maxPrecision); } public static class GeohashGenerator extends CodepointSetGenerator { diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java index ca3be78156..7c8e69d6d9 100644 --- a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java @@ -47,7 +47,7 @@ public class GeoBoundingBoxQueryBuilderTests extends AbstractQueryTestCase<GeoBo @Override protected GeoBoundingBoxQueryBuilder doCreateTestQueryBuilder() { GeoBoundingBoxQueryBuilder builder = new GeoBoundingBoxQueryBuilder(GEO_POINT_FIELD_NAME); - Rectangle box = RandomShapeGenerator.xRandomRectangle(getRandom(), RandomShapeGenerator.xRandomPoint(getRandom())); + Rectangle box = RandomShapeGenerator.xRandomRectangle(random(), RandomShapeGenerator.xRandomPoint(random())); if (randomBoolean()) { // check the top-left/bottom-right combination of setters diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java index 15c18df908..f64736e006 100644 --- a/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java @@ -122,7 +122,7 @@ public class GeoPolygonQueryBuilderTests extends AbstractQueryTestCase<GeoPolygo // returns null. This is if there is an error generating the polygon. So // in this case keep trying until we successfully generate one while (shapeBuilder == null) { - shapeBuilder = RandomShapeGenerator.createShapeWithin(getRandom(), null, ShapeType.POLYGON); + shapeBuilder = RandomShapeGenerator.createShapeWithin(random(), null, ShapeType.POLYGON); } JtsGeometry shape = (JtsGeometry) shapeBuilder.build(); Coordinate[] coordinates = shape.getGeom().getCoordinates(); diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java index 533ce3bfb0..5fc3dbd0dc 100644 --- a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java @@ -59,8 +59,8 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue @Override protected GeoShapeQueryBuilder doCreateTestQueryBuilder() { - ShapeType shapeType = ShapeType.randomType(getRandom()); - ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(getRandom(), null, shapeType); + ShapeType shapeType = ShapeType.randomType(random()); + ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(random(), null, shapeType); GeoShapeQueryBuilder builder; clearShapeFields(); @@ -148,7 +148,7 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue } public void testNoFieldName() throws Exception { - ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(getRandom(), null); + ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(random(), null); try { new GeoShapeQueryBuilder(null, shape); fail("Expected IllegalArgumentException"); @@ -185,7 +185,7 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue } public void testNoRelation() throws IOException { - ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(getRandom(), null); + ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(random(), null); GeoShapeQueryBuilder builder = new GeoShapeQueryBuilder(GEO_SHAPE_FIELD_NAME, shape); try { builder.relation(null); @@ -196,7 +196,7 @@ public class GeoShapeQueryBuilderTests extends AbstractQueryTestCase<GeoShapeQue } public void testInvalidRelation() throws IOException { - ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(getRandom(), null); + ShapeBuilder shape = RandomShapeGenerator.createShapeWithin(random(), null); GeoShapeQueryBuilder builder = new GeoShapeQueryBuilder(GEO_SHAPE_FIELD_NAME, shape); try { builder.strategy(SpatialStrategy.TERM); diff --git a/core/src/test/java/org/elasticsearch/index/query/GeohashCellQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeohashCellQueryBuilderTests.java index a05902aebf..8ea4534cee 100644 --- a/core/src/test/java/org/elasticsearch/index/query/GeohashCellQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/GeohashCellQueryBuilderTests.java @@ -121,7 +121,7 @@ public class GeohashCellQueryBuilderTests extends AbstractQueryTestCase<Builder> } public void testLocationParsing() throws IOException { - Point point = RandomShapeGenerator.xRandomPoint(getRandom()); + Point point = RandomShapeGenerator.xRandomPoint(random()); Builder pointTestBuilder = new GeohashCellQuery.Builder("pin", new GeoPoint(point.getY(), point.getX())); String pointTest1 = "{\"geohash_cell\": {\"pin\": {\"lat\": " + point.getY() + ",\"lon\": " + point.getX() + "}}}"; assertParsedQuery(pointTest1, pointTestBuilder); diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java index 5a42331c52..46385f4ecf 100644 --- a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java @@ -136,7 +136,7 @@ public class QueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStr queryStringQueryBuilder.useDisMax(randomBoolean()); } if (randomBoolean()) { - queryStringQueryBuilder.locale(randomLocale(getRandom())); + queryStringQueryBuilder.locale(randomLocale(random())); } if (randomBoolean()) { queryStringQueryBuilder.timeZone(randomTimeZone()); diff --git a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java index 560ee1881f..4bc9911bf9 100644 --- a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java @@ -58,7 +58,7 @@ public class SimpleQueryStringBuilderTests extends AbstractQueryTestCase<SimpleQ result.lowercaseExpandedTerms(randomBoolean()); } if (randomBoolean()) { - result.locale(randomLocale(getRandom())); + result.locale(randomLocale(random())); } if (randomBoolean()) { result.minimumShouldMatch(randomMinimumShouldMatch()); diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java index 1772e4d49e..cf93a5334f 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java @@ -45,7 +45,7 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue @BeforeClass public static void setupClass() { - templateBase = RandomQueryBuilder.createQuery(getRandom()); + templateBase = RandomQueryBuilder.createQuery(random()); } @Override diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java index f3576c67f8..dd46c4a61d 100644 --- a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java @@ -73,7 +73,7 @@ public class NestedSortingTests extends AbstractFieldDataTestCase { List<Document> docs = new ArrayList<>(numChildren + 1); for (int j = 0; j < numChildren; ++j) { Document doc = new Document(); - doc.add(new StringField("f", TestUtil.randomSimpleString(getRandom(), 2), Field.Store.NO)); + doc.add(new StringField("f", TestUtil.randomSimpleString(random(), 2), Field.Store.NO)); doc.add(new StringField("__type", "child", Field.Store.NO)); docs.add(doc); } @@ -96,7 +96,7 @@ public class NestedSortingTests extends AbstractFieldDataTestCase { IndexSearcher searcher = new IndexSearcher(reader); PagedBytesIndexFieldData indexFieldData1 = getForField("f"); IndexFieldData<?> indexFieldData2 = NoOrdinalsStringFieldDataTests.hideOrdinals(indexFieldData1); - final String missingValue = randomBoolean() ? null : TestUtil.randomSimpleString(getRandom(), 2); + final String missingValue = randomBoolean() ? null : TestUtil.randomSimpleString(random(), 2); final int n = randomIntBetween(1, numDocs + 2); final boolean reverse = randomBoolean(); diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java index aaa1671f84..b91cf428ee 100644 --- a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java +++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java @@ -608,7 +608,7 @@ public class CorruptedFileIT extends ESIntegTestCase { Index test = state.metaData().index("test").getIndex(); GroupShardsIterator shardIterators = state.getRoutingNodes().getRoutingTable().activePrimaryShardsGrouped(new String[]{"test"}, false); List<ShardIterator> iterators = iterableAsArrayList(shardIterators); - ShardIterator shardIterator = RandomPicks.randomFrom(getRandom(), iterators); + ShardIterator shardIterator = RandomPicks.randomFrom(random(), iterators); ShardRouting shardRouting = shardIterator.nextOrNull(); assertNotNull(shardRouting); assertTrue(shardRouting.primary()); @@ -632,7 +632,7 @@ public class CorruptedFileIT extends ESIntegTestCase { } } pruneOldDeleteGenerations(files); - CorruptionUtils.corruptFile(getRandom(), files.toArray(new Path[0])); + CorruptionUtils.corruptFile(random(), files.toArray(new Path[0])); return shardRouting; } diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java index 0a8cd9a6fe..94ee490c72 100644 --- a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java +++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java @@ -113,7 +113,7 @@ public class CorruptedTranslogIT extends ESIntegTestCase { GroupShardsIterator shardIterators = state.getRoutingNodes().getRoutingTable().activePrimaryShardsGrouped(new String[]{"test"}, false); final Index test = state.metaData().index("test").getIndex(); List<ShardIterator> iterators = iterableAsArrayList(shardIterators); - ShardIterator shardIterator = RandomPicks.randomFrom(getRandom(), iterators); + ShardIterator shardIterator = RandomPicks.randomFrom(random(), iterators); ShardRouting shardRouting = shardIterator.nextOrNull(); assertNotNull(shardRouting); assertTrue(shardRouting.primary()); @@ -141,7 +141,7 @@ public class CorruptedTranslogIT extends ESIntegTestCase { if (!files.isEmpty()) { int corruptions = randomIntBetween(5, 20); for (int i = 0; i < corruptions; i++) { - fileToCorrupt = RandomPicks.randomFrom(getRandom(), files); + fileToCorrupt = RandomPicks.randomFrom(random(), files); try (FileChannel raf = FileChannel.open(fileToCorrupt, StandardOpenOption.READ, StandardOpenOption.WRITE)) { // read raf.position(randomIntBetween(0, (int) Math.min(Integer.MAX_VALUE, raf.size() - 1))); diff --git a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java index f4a70a2afa..23925f574f 100644 --- a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java +++ b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java @@ -132,7 +132,7 @@ public class IndexActionIT extends ESIntegTestCase { final AtomicIntegerArray createdCounts = new AtomicIntegerArray(docCount); ExecutorService threadPool = Executors.newFixedThreadPool(threadCount); List<Callable<Void>> tasks = new ArrayList<>(taskCount); - final Random random = getRandom(); + final Random random = random(); for (int i=0;i< taskCount; i++ ) { tasks.add(new Callable<Void>() { @Override diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index 280aac07e3..818fa28a21 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -150,7 +150,7 @@ public class RecoverySourceHandlerTests extends ESTestCase { metas.add(md); } - CorruptionUtils.corruptFile(getRandom(), FileSystemUtils.files(tempDir, (p) -> + CorruptionUtils.corruptFile(random(), FileSystemUtils.files(tempDir, (p) -> (p.getFileName().toString().equals("write.lock") || p.getFileName().toString().startsWith("extra")) == false)); Store targetStore = newStore(createTempDir(), false); diff --git a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java index 8ce4229172..efdae8106a 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java @@ -187,7 +187,7 @@ public class RareClusterStateIT extends ESIntegTestCase { nodes.remove(internalCluster().getMasterName()); // block none master node. - BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(nodes.iterator().next(), getRandom()); + BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(nodes.iterator().next(), random()); internalCluster().setDisruptionScheme(disruption); logger.info("--> indexing a doc"); index("test", "type", "1"); @@ -247,7 +247,7 @@ public class RareClusterStateIT extends ESIntegTestCase { } // Block cluster state processing where our shard is - BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(otherNode, getRandom()); + BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(otherNode, random()); internalCluster().setDisruptionScheme(disruption); disruption.startDisrupting(); @@ -365,7 +365,7 @@ public class RareClusterStateIT extends ESIntegTestCase { } // Block cluster state processing on the replica - BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(otherNode, getRandom()); + BlockClusterStateProcessing disruption = new BlockClusterStateProcessing(otherNode, random()); internalCluster().setDisruptionScheme(disruption); disruption.startDisrupting(); final AtomicReference<Object> putMappingResponse = new AtomicReference<>(); diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java index 12e6d2b479..b327188ccf 100644 --- a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java @@ -592,7 +592,7 @@ public class IndexStatsIT extends ESIntegTestCase { assertThat(isSet(flag, stats.getPrimaries()), equalTo(true)); assertThat(isSet(flag, stats.getTotal()), equalTo(true)); } - Random random = getRandom(); + Random random = random(); EnumSet<Flag> flags = EnumSet.noneOf(Flag.class); for (Flag flag : values) { if (random.nextBoolean()) { @@ -638,7 +638,7 @@ public class IndexStatsIT extends ESIntegTestCase { flags.set(flag, true); } assertThat(flags.anySet(), equalTo(true)); - Random random = getRandom(); + Random random = random(); flags.set(values[random.nextInt(values.length)], false); assertThat(flags.anySet(), equalTo(true)); diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java index 84d86324fe..4251241c62 100644 --- a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java @@ -140,7 +140,7 @@ public class IndicesStoreIntegrationIT extends ESIntegTestCase { logger.info("--> move shard from node_1 to node_3, and wait for relocation to finish"); if (randomBoolean()) { // sometimes add cluster-state delay to trigger observers in IndicesStore.ShardActiveRequestHandler - SingleNodeDisruption disruption = new BlockClusterStateProcessing(node_3, getRandom()); + SingleNodeDisruption disruption = new BlockClusterStateProcessing(node_3, random()); internalCluster().setDisruptionScheme(disruption); MockTransportService transportServiceNode3 = (MockTransportService) internalCluster().getInstance(TransportService.class, node_3); CountDownLatch beginRelocationLatch = new CountDownLatch(1); diff --git a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java index 8c18d1dd74..a4837e382a 100644 --- a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java +++ b/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java @@ -369,7 +369,7 @@ public class MultiValueModeTests extends ESTestCase { final FixedBitSet docsWithValue = randomBoolean() ? null : new FixedBitSet(numDocs); for (int i = 0; i < array.length; ++i) { if (randomBoolean()) { - array[i] = new BytesRef(RandomStrings.randomAsciiOfLength(getRandom(), 8)); + array[i] = new BytesRef(RandomStrings.randomAsciiOfLength(random(), 8)); if (docsWithValue != null) { docsWithValue.set(i); } @@ -399,7 +399,7 @@ public class MultiValueModeTests extends ESTestCase { for (int i = 0; i < numDocs; ++i) { final BytesRef[] values = new BytesRef[randomInt(4)]; for (int j = 0; j < values.length; ++j) { - values[j] = new BytesRef(RandomStrings.randomAsciiOfLength(getRandom(), 8)); + values[j] = new BytesRef(RandomStrings.randomAsciiOfLength(random(), 8)); } Arrays.sort(values); array[i] = values; @@ -429,7 +429,7 @@ public class MultiValueModeTests extends ESTestCase { } private void verify(SortedBinaryDocValues values, int maxDoc) { - for (BytesRef missingValue : new BytesRef[] { new BytesRef(), new BytesRef(RandomStrings.randomAsciiOfLength(getRandom(), 8)) }) { + for (BytesRef missingValue : new BytesRef[] { new BytesRef(), new BytesRef(RandomStrings.randomAsciiOfLength(random(), 8)) }) { for (MultiValueMode mode : new MultiValueMode[] {MultiValueMode.MIN, MultiValueMode.MAX}) { final BinaryDocValues selected = mode.select(values, missingValue); for (int i = 0; i < maxDoc; ++i) { @@ -463,7 +463,7 @@ public class MultiValueModeTests extends ESTestCase { } private void verify(SortedBinaryDocValues values, int maxDoc, FixedBitSet rootDocs, FixedBitSet innerDocs) throws IOException { - for (BytesRef missingValue : new BytesRef[] { new BytesRef(), new BytesRef(RandomStrings.randomAsciiOfLength(getRandom(), 8)) }) { + for (BytesRef missingValue : new BytesRef[] { new BytesRef(), new BytesRef(RandomStrings.randomAsciiOfLength(random(), 8)) }) { for (MultiValueMode mode : new MultiValueMode[] {MultiValueMode.MIN, MultiValueMode.MAX}) { final BinaryDocValues selected = mode.select(values, missingValue, rootDocs, new BitSetIterator(innerDocs, 0L), maxDoc); int prevRoot = -1; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorParsingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorParsingTests.java index 698882c5cd..bb9e2f4b32 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorParsingTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorParsingTests.java @@ -260,7 +260,7 @@ public class AggregatorParsingTests extends ESTestCase { public void testInvalidAggregationName() throws Exception { Matcher matcher = Pattern.compile("[^\\[\\]>]+").matcher(""); String name; - Random rand = getRandom(); + Random rand = random(); int len = randomIntBetween(1, 5); char[] word = new char[len]; while (true) { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java index b1fa01c5f1..89dd3e3b13 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java @@ -32,7 +32,7 @@ public class GeoDistanceRangeTests extends BaseAggregationTestCase<GeoDistanceAg @Override protected GeoDistanceAggregatorBuilder createTestAggregatorBuilder() { int numRanges = randomIntBetween(1, 10); - GeoPoint origin = RandomShapeGenerator.randomPoint(getRandom()); + GeoPoint origin = RandomShapeGenerator.randomPoint(random()); GeoDistanceAggregatorBuilder factory = new GeoDistanceAggregatorBuilder("foo", origin); for (int i = 0; i < numRanges; i++) { String key = null; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java index 5aa7ba4446..a9a9f07013 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java @@ -94,7 +94,7 @@ public class GeoHashGridIT extends ESIntegTestCase { .addMapping("type", "location", "type=geo_point", "city", "type=keyword")); List<IndexRequestBuilder> cities = new ArrayList<>(); - Random random = getRandom(); + Random random = random(); expectedDocCountsForGeoHash = new ObjectIntHashMap<>(numDocs * 2); for (int i = 0; i < numDocs; i++) { //generate random point diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java index e6b0981f54..4f3b3db7c9 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java @@ -139,7 +139,7 @@ public class ScriptValuesTests extends ESTestCase { for (int i = 0; i < values.length; ++i) { String[] strings = new String[randomInt(8)]; for (int j = 0; j < strings.length; ++j) { - strings[j] = RandomStrings.randomAsciiOfLength(getRandom(), 5); + strings[j] = RandomStrings.randomAsciiOfLength(random(), 5); } Arrays.sort(strings); values[i] = strings; diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java index 83e89592b8..ccc4909155 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java @@ -567,7 +567,7 @@ public class GeoFilterIT extends ESIntegTestCase { } protected static String randomhash(int length) { - return randomhash(getRandom(), length); + return randomhash(random(), length); } protected static String randomhash(Random random) { @@ -575,7 +575,7 @@ public class GeoFilterIT extends ESIntegTestCase { } protected static String randomhash() { - return randomhash(getRandom()); + return randomhash(random()); } protected static String randomhash(Random random, int length) { diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java index d124fcf638..0fe90f133b 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java @@ -297,7 +297,7 @@ public class GeoShapeQueryTests extends ESSingleNodeTestCase { public void testShapeFilterWithRandomGeoCollection() throws Exception { // Create a random geometry collection. - GeometryCollectionBuilder gcb = RandomShapeGenerator.createGeometryCollection(getRandom()); + GeometryCollectionBuilder gcb = RandomShapeGenerator.createGeometryCollection(random()); logger.info("Created Random GeometryCollection containing {} shapes", gcb.numShapes()); @@ -319,8 +319,8 @@ public class GeoShapeQueryTests extends ESSingleNodeTestCase { public void testContainsShapeQuery() throws Exception { // Create a random geometry collection. - Rectangle mbr = xRandomRectangle(getRandom(), xRandomPoint(getRandom()), true); - GeometryCollectionBuilder gcb = createGeometryCollectionWithin(getRandom(), mbr); + Rectangle mbr = xRandomRectangle(random(), xRandomPoint(random()), true); + GeometryCollectionBuilder gcb = createGeometryCollectionWithin(random(), mbr); client().admin().indices().prepareCreate("test").addMapping("type", "location", "type=geo_shape,tree=quadtree" ) .execute().actionGet(); diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java index fa8caaf0ed..6839188ca4 100644 --- a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java @@ -2030,7 +2030,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { refresh(); final int iters = scaledRandomIntBetween(20, 30); for (int i = 0; i < iters; i++) { - String highlighterType = rarely() ? null : RandomPicks.randomFrom(getRandom(), highlighterTypes); + String highlighterType = rarely() ? null : RandomPicks.randomFrom(random(), highlighterTypes); MultiMatchQueryBuilder.Type[] supportedQueryTypes; if ("postings".equals(highlighterType)) { //phrase_prefix is not supported by postings highlighter, as it rewrites against an empty reader, the prefix will never match any term @@ -2038,7 +2038,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { } else { supportedQueryTypes = MultiMatchQueryBuilder.Type.values(); } - MultiMatchQueryBuilder.Type matchQueryType = RandomPicks.randomFrom(getRandom(), supportedQueryTypes); + MultiMatchQueryBuilder.Type matchQueryType = RandomPicks.randomFrom(random(), supportedQueryTypes); final MultiMatchQueryBuilder multiMatchQueryBuilder = multiMatchQuery("the quick brown fox", "field1", "field2").type(matchQueryType); SearchSourceBuilder source = searchSource() diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java index be190b547e..72e9b5beac 100644 --- a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java @@ -130,7 +130,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { fill(lastNames, "Captain", between(3, 7)); fillRandom(lastNames, between(30, 40)); for (int i = 0; i < numDocs; i++) { - String first = RandomPicks.randomFrom(getRandom(), firstNames); + String first = RandomPicks.randomFrom(random(), firstNames); String last = randomPickExcept(lastNames, first); builders.add(client().prepareIndex("test", "test", "" + i).setSource( "full_name", first + " " + last, @@ -245,11 +245,11 @@ public class MultiMatchQueryIT extends ESIntegTestCase { // check if it's equivalent to a match query. int numIters = scaledRandomIntBetween(10, 100); for (int i = 0; i < numIters; i++) { - String field = RandomPicks.randomFrom(getRandom(), fields); + String field = RandomPicks.randomFrom(random(), fields); int numTerms = randomIntBetween(1, query.length); StringBuilder builder = new StringBuilder(); for (int j = 0; j < numTerms; j++) { - builder.append(RandomPicks.randomFrom(getRandom(), query)).append(" "); + builder.append(RandomPicks.randomFrom(random(), query)).append(" "); } MultiMatchQueryBuilder multiMatchQueryBuilder = randomizeType(multiMatchQuery(builder.toString(), field)); SearchResponse multiMatchResp = client().prepareSearch("test") @@ -661,7 +661,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { public <T> T randomPickExcept(List<T> fromList, T butNot) { while (true) { - T t = RandomPicks.randomFrom(getRandom(), fromList); + T t = RandomPicks.randomFrom(random(), fromList); if (t.equals(butNot)) { continue; } diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java index 9643f248d3..5bbae82b7d 100644 --- a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java +++ b/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java @@ -73,7 +73,7 @@ public class QueryPhaseTests extends ESTestCase { private void countTestCase(boolean withDeletions) throws Exception { Directory dir = newDirectory(); IndexWriterConfig iwc = newIndexWriterConfig().setMergePolicy(NoMergePolicy.INSTANCE); - RandomIndexWriter w = new RandomIndexWriter(getRandom(), dir, iwc); + RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc); final int numDocs = scaledRandomIntBetween(100, 200); for (int i = 0; i < numDocs; ++i) { Document doc = new Document(); diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java index 891911b620..46fff1c630 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -206,7 +206,7 @@ public class SearchQueryIT extends ESIntegTestCase { // see #3521 public void testConstantScoreQuery() throws Exception { - Random random = getRandom(); + Random random = random(); createIndex("test"); indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("field1", "quick brown fox", "field2", "quick brown fox"), client().prepareIndex("test", "type1", "2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox")); @@ -218,11 +218,11 @@ public class SearchQueryIT extends ESIntegTestCase { searchResponse = client().prepareSearch("test").setQuery( boolQuery().must(matchAllQuery()).must( - constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + getRandom().nextFloat()))).get(); + constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat()))).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasScore(searchResponse.getHits().getAt(1).score())); - client().prepareSearch("test").setQuery(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + getRandom().nextFloat())).get(); + client().prepareSearch("test").setQuery(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat())).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasScore(searchResponse.getHits().getAt(1).score())); diff --git a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java index 6c0b996394..e1cf0d3fc8 100644 --- a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java +++ b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java @@ -203,7 +203,7 @@ public class DuelScrollIT extends ESIntegTestCase { } sort.order(randomBoolean() ? SortOrder.ASC : SortOrder.DESC); - SearchType searchType = RandomPicks.randomFrom(getRandom(), Arrays.asList(searchTypes)); + SearchType searchType = RandomPicks.randomFrom(random(), Arrays.asList(searchTypes)); logger.info("numDocs={}, scrollRequestSize={}, sort={}, searchType={}", numDocs, scrollRequestSize, sort, searchType); return new TestContext(numDocs, scrollRequestSize, sort, searchType); diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java b/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java index 2419dd2c50..fd2de07882 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java +++ b/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java @@ -220,7 +220,7 @@ public class FieldSortIT extends ESIntegTestCase { } public void testRandomSorting() throws IOException, InterruptedException, ExecutionException { - Random random = getRandom(); + Random random = random(); assertAcked(prepareCreate("test") .addMapping("type", XContentFactory.jsonBuilder() diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java index d2a7624e08..f6357b7c61 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java @@ -52,13 +52,13 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc int count = randomIntBetween(1, 10); String[] geohashes = new String[count]; for (int i = 0; i < count; i++) { - geohashes[i] = RandomGeoGenerator.randomPoint(getRandom()).geohash(); + geohashes[i] = RandomGeoGenerator.randomPoint(random()).geohash(); } result = new GeoDistanceSortBuilder(fieldName, geohashes); break; case 1: - GeoPoint pt = RandomGeoGenerator.randomPoint(getRandom()); + GeoPoint pt = RandomGeoGenerator.randomPoint(random()); result = new GeoDistanceSortBuilder(fieldName, pt.getLat(), pt.getLon()); break; case 2: @@ -125,7 +125,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc int count = randomIntBetween(1, 10); result = new GeoPoint[count]; for (int i = 0; i < count; i++) { - result[i] = RandomGeoGenerator.randomPoint(getRandom()); + result[i] = RandomGeoGenerator.randomPoint(random()); } } return result; @@ -146,7 +146,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc switch (parameter) { case 0: while (Arrays.deepEquals(original.points(), result.points())) { - GeoPoint pt = RandomGeoGenerator.randomPoint(getRandom()); + GeoPoint pt = RandomGeoGenerator.randomPoint(random()); result.point(pt.getLat(), pt.getLon()); } break; @@ -192,7 +192,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc public void testSortModeSumIsRejectedInSetter() { GeoDistanceSortBuilder builder = new GeoDistanceSortBuilder("testname", -1, -1); - GeoPoint point = RandomGeoGenerator.randomPoint(getRandom()); + GeoPoint point = RandomGeoGenerator.randomPoint(random()); builder.point(point.getLat(), point.getLon()); try { builder.sortMode(SortMode.SUM); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java index 152c450f6e..87336b0c62 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java @@ -83,9 +83,9 @@ import static org.hamcrest.Matchers.notNullValue; @SuppressCodecs("*") // requires custom completion format public class CompletionSuggestSearchIT extends ESIntegTestCase { - private final String INDEX = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); - private final String TYPE = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); - private final String FIELD = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); + private final String INDEX = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); + private final String TYPE = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); + private final String FIELD = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); private final CompletionMappingBuilder completionMappingBuilder = new CompletionMappingBuilder(); public void testPrefix() throws Exception { @@ -1169,8 +1169,8 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { static class CompletionMappingBuilder { String searchAnalyzer = "simple"; String indexAnalyzer = "simple"; - Boolean preserveSeparators = getRandom().nextBoolean(); - Boolean preservePositionIncrements = getRandom().nextBoolean(); + Boolean preserveSeparators = random().nextBoolean(); + Boolean preservePositionIncrements = random().nextBoolean(); LinkedHashMap<String, ContextMapping> contextMappings = null; public CompletionMappingBuilder searchAnalyzer(String searchAnalyzer) { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java index 256d44769a..db5902c70f 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java @@ -55,9 +55,9 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke @SuppressCodecs("*") // requires custom completion format public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { - private final String INDEX = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); - private final String TYPE = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); - private final String FIELD = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); + private final String INDEX = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); + private final String TYPE = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); + private final String FIELD = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java index 5dbd082ec8..229fc86540 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java @@ -145,7 +145,7 @@ public class CompletionSuggesterBuilderTests extends AbstractSuggestionBuilderTe * Test that a malformed JSON suggestion request fails. */ public void testMalformedJsonRequestPayload() throws Exception { - final String field = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); + final String field = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); final String payload = "{\n" + " \"bad-payload\" : { \n" + " \"prefix\" : \"sug\",\n" + diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java b/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java index df576169f3..588957137f 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java @@ -151,7 +151,7 @@ public class TermSuggestionBuilderTests extends AbstractSuggestionBuilderTestCas assertEquals("suggestion field name is empty", e.getMessage()); TermSuggestionBuilder builder = new TermSuggestionBuilder(randomAsciiOfLengthBetween(2, 20)); - + // test invalid accuracy values expectThrows(IllegalArgumentException.class, () -> builder.accuracy(-0.5f)); expectThrows(IllegalArgumentException.class, () -> builder.accuracy(1.1f)); @@ -206,7 +206,7 @@ public class TermSuggestionBuilderTests extends AbstractSuggestionBuilderTestCas } public void testMalformedJson() { - final String field = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); + final String field = RandomStrings.randomAsciiOfLength(random(), 10).toLowerCase(Locale.ROOT); String suggest = "{\n" + " \"bad-payload\" : {\n" + " \"text\" : \"the amsterdma meetpu\",\n" + diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java index b3f466cdcc..bb95d10f18 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java @@ -72,11 +72,11 @@ public class SnapshotBackwardsCompatibilityIT extends ESBackcompatTestCase { logger.info("--> indexing some data"); IndexRequestBuilder[] buildersBefore = new IndexRequestBuilder[randomIntBetween(10, 200)]; for (int i = 0; i < buildersBefore.length; i++) { - buildersBefore[i] = client().prepareIndex(RandomPicks.randomFrom(getRandom(), indicesBefore), "foo", Integer.toString(i)).setSource("{ \"foo\" : \"bar\" } "); + buildersBefore[i] = client().prepareIndex(RandomPicks.randomFrom(random(), indicesBefore), "foo", Integer.toString(i)).setSource("{ \"foo\" : \"bar\" } "); } IndexRequestBuilder[] buildersAfter = new IndexRequestBuilder[randomIntBetween(10, 200)]; for (int i = 0; i < buildersAfter.length; i++) { - buildersAfter[i] = client().prepareIndex(RandomPicks.randomFrom(getRandom(), indicesBefore), "bar", Integer.toString(i)).setSource("{ \"foo\" : \"bar\" } "); + buildersAfter[i] = client().prepareIndex(RandomPicks.randomFrom(random(), indicesBefore), "bar", Integer.toString(i)).setSource("{ \"foo\" : \"bar\" } "); } indexRandom(true, buildersBefore); indexRandom(true, buildersAfter); @@ -97,7 +97,7 @@ public class SnapshotBackwardsCompatibilityIT extends ESBackcompatTestCase { int howMany = randomIntBetween(1, buildersBefore.length); for (int i = 0; i < howMany; i++) { - IndexRequestBuilder indexRequestBuilder = RandomPicks.randomFrom(getRandom(), buildersBefore); + IndexRequestBuilder indexRequestBuilder = RandomPicks.randomFrom(random(), buildersBefore); IndexRequest request = indexRequestBuilder.request(); client().prepareDelete(request.index(), request.type(), request.id()).get(); } @@ -144,7 +144,7 @@ public class SnapshotBackwardsCompatibilityIT extends ESBackcompatTestCase { // Test restore after index deletion logger.info("--> delete indices"); - String index = RandomPicks.randomFrom(getRandom(), indices); + String index = RandomPicks.randomFrom(random(), indices); cluster().wipeIndices(index); logger.info("--> restore one index after deletion"); restoreSnapshotResponse = client().admin().cluster().prepareRestoreSnapshot("test-repo", "test-snap-2").setWaitForCompletion(true).setIndices(index).execute().actionGet(); diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java index 7313d880a6..86d5ca09fd 100644 --- a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java +++ b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java @@ -95,9 +95,9 @@ public class TribeIT extends ESIntegTestCase { }; cluster2 = new InternalTestCluster(InternalTestCluster.configuredNodeMode(), randomLong(), createTempDir(), 2, 2, - Strings.randomBase64UUID(getRandom()), nodeConfigurationSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, Collections.emptyList(), Function.identity()); + Strings.randomBase64UUID(random()), nodeConfigurationSource, 0, false, SECOND_CLUSTER_NODE_PREFIX, Collections.emptyList(), Function.identity()); - cluster2.beforeTest(getRandom(), 0.1); + cluster2.beforeTest(random(), 0.1); cluster2.ensureAtLeastNumDataNodes(2); } diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index 4e319c65ba..5787df3cd7 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -350,7 +350,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { private IDSource getRandomIDs() { IDSource ids; - final Random random = getRandom(); + final Random random = random(); switch (random.nextInt(6)) { case 0: // random simple @@ -516,7 +516,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { newSettings.put("index.gc_deletes", "1000000h"); assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(newSettings).execute().actionGet()); - Random random = getRandom(); + Random random = random(); // Generate random IDs: IDSource idSource = getRandomIDs(); @@ -596,7 +596,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { public void run() { try { //final Random threadRandom = RandomizedContext.current().getRandom(); - final Random threadRandom = getRandom(); + final Random threadRandom = random(); startingGun.await(); while (true) { |