Skip to content

Move repo analyzer to its own package #111963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaveCTurner merged 1 commit into from
Aug 19, 2024
Merged

Move repo analyzer to its own package #111963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...e/testkit/AzureSnapshotRepoTestKitIT.java → ...nalyze/AzureRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import fixture.azure.AzureHttpFixture;

Expand All @@ -25,7 +25,7 @@
import static org.hamcrest.Matchers.blankOrNullString;
import static org.hamcrest.Matchers.not;

public class AzureSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public class AzureRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
private static final boolean USE_FIXTURE = Booleans.parseBoolean(System.getProperty("test.azure.fixture", "true"));
private static final boolean USE_HTTPS_FIXTURE = USE_FIXTURE && ESTestCase.inFipsJvm() == false;
// TODO when https://github.com/elastic/elasticsearch/issues/111532 addressed, use a HTTPS fixture in FIPS mode too
Expand Down
4 changes: 2 additions & 2 deletions ...ore/testkit/GCSSnapshotRepoTestKitIT.java → .../analyze/GCSRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import fixture.gcs.GoogleCloudStorageHttpFixture;
import fixture.gcs.TestUtils;
Expand All @@ -23,7 +23,7 @@
import static org.hamcrest.Matchers.blankOrNullString;
import static org.hamcrest.Matchers.not;

public class GCSSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public class GCSRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
private static final boolean USE_FIXTURE = Booleans.parseBoolean(System.getProperty("test.google.fixture", "true"));

private static GoogleCloudStorageHttpFixture fixture = new GoogleCloudStorageHttpFixture(USE_FIXTURE, "bucket", "o/oauth2/token");
Expand Down
4 changes: 2 additions & 2 deletions ...it/AbstractHdfsSnapshotRepoTestKitIT.java → ...AbstractHdfsRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.common.settings.Settings;

import static org.hamcrest.Matchers.blankOrNullString;
import static org.hamcrest.Matchers.not;

public abstract class AbstractHdfsSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public abstract class AbstractHdfsRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {

@Override
protected String repositoryType() {
Expand Down
4 changes: 2 additions & 2 deletions ...re/testkit/HdfsSnapshotRepoTestKitIT.java → ...analyze/HdfsRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;

Expand All @@ -17,7 +17,7 @@
import org.junit.rules.TestRule;

@ThreadLeakFilters(filters = { HdfsClientThreadLeakFilter.class })
public class HdfsSnapshotRepoTestKitIT extends AbstractHdfsSnapshotRepoTestKitIT {
public class HdfsRepositoryAnalysisRestIT extends AbstractHdfsRepositoryAnalysisRestIT {

public static HdfsFixture hdfsFixture = new HdfsFixture();

Expand Down
4 changes: 2 additions & 2 deletions ...tkit/SecureHdfsSnapshotRepoTestKitIT.java → ...e/SecureHdfsRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;

Expand All @@ -22,7 +22,7 @@
import org.junit.rules.TestRule;

@ThreadLeakFilters(filters = { HdfsClientThreadLeakFilter.class, TestContainersThreadFilter.class })
public class SecureHdfsSnapshotRepoTestKitIT extends AbstractHdfsSnapshotRepoTestKitIT {
public class SecureHdfsRepositoryAnalysisRestIT extends AbstractHdfsRepositoryAnalysisRestIT {

public static Krb5kDcContainer krb5Fixture = new Krb5kDcContainer();

Expand Down
4 changes: 2 additions & 2 deletions ...e/testkit/MinioSnapshotRepoTestKitIT.java → ...nalyze/MinioRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;

Expand All @@ -18,7 +18,7 @@
import org.junit.rules.TestRule;

@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
public class MinioSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {

public static final MinioTestContainer minioFixture = new MinioTestContainer();

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/snapshot-repo-test-kit/qa/rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ testClusters.matching { it.name == "yamlRestTest" }.configureEach {
}

tasks.named('yamlRestTestTestingConventions').configure {
baseClass 'org.elasticsearch.repositories.blobstore.testkit.AbstractSnapshotRepoTestKitRestTestCase'
baseClass 'org.elasticsearch.repositories.blobstore.testkit.analyze.AbstractRepositoryAnalysisRestTestCase'
baseClass 'org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase'
}

Expand Down
5 changes: 2 additions & 3 deletions ...testkit/rest/FsSnapshotRepoTestKitIT.java → ...t/analyze/FsRepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit.rest;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.repositories.blobstore.testkit.AbstractSnapshotRepoTestKitRestTestCase;
import org.elasticsearch.repositories.fs.FsRepository;

public class FsSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public class FsRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {

@Override
protected String repositoryType() {
Expand Down
4 changes: 2 additions & 2 deletions ...tore/testkit/S3SnapshotRepoTestKitIT.java → ...t/analyze/S3RepositoryAnalysisRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import fixture.s3.S3HttpFixture;

Expand All @@ -18,7 +18,7 @@
import static org.hamcrest.Matchers.blankOrNullString;
import static org.hamcrest.Matchers.not;

public class S3SnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
public class S3RepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {

static final boolean USE_FIXTURE = Boolean.parseBoolean(System.getProperty("tests.use.fixture", "true"));

Expand Down
2 changes: 1 addition & 1 deletion ...ries/blobstore/testkit/BytesRegister.java → ...bstore/testkit/analyze/BytesRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
Expand Down
7 changes: 4 additions & 3 deletions .../testkit/RepositoryAnalysisFailureIT.java → .../analyze/RepositoryAnalysisFailureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionListener;
Expand Down Expand Up @@ -40,6 +40,7 @@
import org.elasticsearch.repositories.RepositoryMissingException;
import org.elasticsearch.repositories.RepositoryVerificationException;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKit;
import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
Expand All @@ -66,8 +67,8 @@
import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING;
import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.MAX_RESTORE_BYTES_PER_SEC;
import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.MAX_SNAPSHOT_BYTES_PER_SEC;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.anEmptyMap;
import static org.hamcrest.Matchers.anyOf;
Expand Down
7 changes: 4 additions & 3 deletions .../testkit/RepositoryAnalysisSuccessIT.java → .../analyze/RepositoryAnalysisSuccessIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
Expand Down Expand Up @@ -36,6 +36,7 @@
import org.elasticsearch.repositories.Repository;
import org.elasticsearch.repositories.RepositoryMissingException;
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
import org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKit;
import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xcontent.ObjectPath;
Expand All @@ -61,8 +62,8 @@
import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING;
import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.MAX_RESTORE_BYTES_PER_SEC;
import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.MAX_SNAPSHOT_BYTES_PER_SEC;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.elasticsearch.repositories.blobstore.testkit.RepositoryAnalysisFailureIT.isContendedRegisterKey;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.RepositoryAnalysisFailureIT.isContendedRegisterKey;
import static org.elasticsearch.test.XContentTestUtils.convertToMap;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.allOf;
Expand Down
5 changes: 4 additions & 1 deletion ...main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.elasticsearch.features.NodeFeature;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.blobstore.testkit.analyze.RepositoryAnalyzeAction;
import org.elasticsearch.repositories.blobstore.testkit.analyze.RestRepositoryAnalyzeAction;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -51,7 +53,8 @@ public List<RestHandler> getRestHandlers(
return List.of(new RestRepositoryAnalyzeAction());
}

static void humanReadableNanos(XContentBuilder builder, String rawFieldName, String readableFieldName, long nanos) throws IOException {
public static void humanReadableNanos(XContentBuilder builder, String rawFieldName, String readableFieldName, long nanos)
throws IOException {
assert rawFieldName.equals(readableFieldName) == false : rawFieldName + " vs " + readableFieldName;

if (builder.humanReadable()) {
Expand Down
2 changes: 1 addition & 1 deletion .../blobstore/testkit/BlobAnalyzeAction.java → ...re/testkit/analyze/BlobAnalyzeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...re/testkit/BlobWriteAbortedException.java → ...it/analyze/BlobWriteAbortedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

public class BlobWriteAbortedException extends RuntimeException {
public BlobWriteAbortedException() {
Expand Down
2 changes: 1 addition & 1 deletion ...stkit/ContendedRegisterAnalyzeAction.java → ...alyze/ContendedRegisterAnalyzeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...bstore/testkit/GetBlobChecksumAction.java → ...estkit/analyze/GetBlobChecksumAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion .../blobstore/testkit/RandomBlobContent.java → ...re/testkit/analyze/RandomBlobContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.repositories.RepositoryVerificationException;

Expand Down
2 changes: 1 addition & 1 deletion ...tkit/RandomBlobContentBytesReference.java → ...lyze/RandomBlobContentBytesReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefIterator;
Expand Down
2 changes: 1 addition & 1 deletion ...tore/testkit/RandomBlobContentStream.java → ...tkit/analyze/RandomBlobContentStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import java.io.InputStream;

Expand Down
8 changes: 4 additions & 4 deletions ...tore/testkit/RepositoryAnalyzeAction.java → ...tkit/analyze/RepositoryAnalyzeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -83,10 +83,10 @@
import java.util.stream.IntStream;

import static org.elasticsearch.core.Strings.format;
import static org.elasticsearch.repositories.blobstore.testkit.BlobAnalyzeAction.MAX_ATOMIC_WRITE_SIZE;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKit.humanReadableNanos;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.BlobAnalyzeAction.MAX_ATOMIC_WRITE_SIZE;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.longFromBytes;

/**
* Action which distributes a bunch of {@link BlobAnalyzeAction}s over the nodes in the cluster, with limited concurrency, and collects
Expand Down
2 changes: 1 addition & 1 deletion ...testkit/RepositoryPerformanceSummary.java → ...analyze/RepositoryPerformanceSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down
2 changes: 1 addition & 1 deletion .../testkit/RestRepositoryAnalyzeAction.java → .../analyze/RestRepositoryAnalyzeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.rest.BaseRestHandler;
Expand Down
6 changes: 3 additions & 3 deletions ...kit/UncontendedRegisterAnalyzeAction.java → ...yze/UncontendedRegisterAnalyzeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -38,8 +38,8 @@
import java.io.IOException;
import java.util.Map;

import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.ContendedRegisterAnalyzeAction.longFromBytes;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.bytesFromLong;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.ContendedRegisterAnalyzeAction.longFromBytes;

class UncontendedRegisterAnalyzeAction extends HandledTransportAction<UncontendedRegisterAnalyzeAction.Request, ActionResponse.Empty> {

Expand Down
4 changes: 2 additions & 2 deletions ...tractSnapshotRepoTestKitRestTestCase.java → ...stractRepositoryAnalysisRestTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.apache.http.client.methods.HttpPost;
import org.elasticsearch.client.Request;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.rest.ESRestTestCase;

public abstract class AbstractSnapshotRepoTestKitRestTestCase extends ESRestTestCase {
public abstract class AbstractRepositoryAnalysisRestTestCase extends ESRestTestCase {

protected abstract String repositoryType();

Expand Down
4 changes: 2 additions & 2 deletions ...RandomBlobContentBytesReferenceTests.java → ...RandomBlobContentBytesReferenceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* 2.0.
*/

package org.elasticsearch.repositories.blobstore.testkit;
package org.elasticsearch.repositories.blobstore.testkit.analyze;

import org.elasticsearch.test.ESTestCase;

import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.zip.CRC32;

import static org.elasticsearch.repositories.blobstore.testkit.RandomBlobContent.BUFFER_SIZE;
import static org.elasticsearch.repositories.blobstore.testkit.analyze.RandomBlobContent.BUFFER_SIZE;
import static org.hamcrest.Matchers.equalTo;

public class RandomBlobContentBytesReferenceTests extends ESTestCase {
Expand Down
Loading