Skip to content

Commit d2e6670

Browse files
authored
Move repo analyzer to its own package (elastic#111963)
In preparation for adding more things to the blobstore testkit, this commit moves the repository analyzer implementation from `o.e.r.blobstore.testkit` to `o.e.r.blobstore.testkit.analyze`.
1 parent 06d09fc commit d2e6670

File tree

28 files changed

+53
-49
lines changed

28 files changed

+53
-49
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.repositories.blobstore.testkit;
7+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
88

99
import fixture.azure.AzureHttpFixture;
1010

@@ -25,7 +25,7 @@
2525
import static org.hamcrest.Matchers.blankOrNullString;
2626
import static org.hamcrest.Matchers.not;
2727

28-
public class AzureSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
28+
public class AzureRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
2929
private static final boolean USE_FIXTURE = Booleans.parseBoolean(System.getProperty("test.azure.fixture", "true"));
3030
private static final boolean USE_HTTPS_FIXTURE = USE_FIXTURE && ESTestCase.inFipsJvm() == false;
3131
// TODO when https://github.com/elastic/elasticsearch/issues/111532 addressed, use a HTTPS fixture in FIPS mode too
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.repositories.blobstore.testkit;
7+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
88

99
import fixture.gcs.GoogleCloudStorageHttpFixture;
1010
import fixture.gcs.TestUtils;
@@ -23,7 +23,7 @@
2323
import static org.hamcrest.Matchers.blankOrNullString;
2424
import static org.hamcrest.Matchers.not;
2525

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

2929
private static GoogleCloudStorageHttpFixture fixture = new GoogleCloudStorageHttpFixture(USE_FIXTURE, "bucket", "o/oauth2/token");
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
* 2.0.
66
*/
77

8-
package org.elasticsearch.repositories.blobstore.testkit;
8+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
99

1010
import org.elasticsearch.common.settings.Settings;
1111

1212
import static org.hamcrest.Matchers.blankOrNullString;
1313
import static org.hamcrest.Matchers.not;
1414

15-
public abstract class AbstractHdfsSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
15+
public abstract class AbstractHdfsRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
1616

1717
@Override
1818
protected String repositoryType() {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.repositories.blobstore.testkit;
7+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
88

99
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
1010

@@ -17,7 +17,7 @@
1717
import org.junit.rules.TestRule;
1818

1919
@ThreadLeakFilters(filters = { HdfsClientThreadLeakFilter.class })
20-
public class HdfsSnapshotRepoTestKitIT extends AbstractHdfsSnapshotRepoTestKitIT {
20+
public class HdfsRepositoryAnalysisRestIT extends AbstractHdfsRepositoryAnalysisRestIT {
2121

2222
public static HdfsFixture hdfsFixture = new HdfsFixture();
2323

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* 2.0.
66
*/
77

8-
package org.elasticsearch.repositories.blobstore.testkit;
8+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
99

1010
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
1111

@@ -22,7 +22,7 @@
2222
import org.junit.rules.TestRule;
2323

2424
@ThreadLeakFilters(filters = { HdfsClientThreadLeakFilter.class, TestContainersThreadFilter.class })
25-
public class SecureHdfsSnapshotRepoTestKitIT extends AbstractHdfsSnapshotRepoTestKitIT {
25+
public class SecureHdfsRepositoryAnalysisRestIT extends AbstractHdfsRepositoryAnalysisRestIT {
2626

2727
public static Krb5kDcContainer krb5Fixture = new Krb5kDcContainer();
2828

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.repositories.blobstore.testkit;
7+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
88

99
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
1010

@@ -18,7 +18,7 @@
1818
import org.junit.rules.TestRule;
1919

2020
@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
21-
public class MinioSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
21+
public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
2222

2323
public static final MinioTestContainer minioFixture = new MinioTestContainer();
2424

x-pack/plugin/snapshot-repo-test-kit/qa/rest/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ testClusters.matching { it.name == "yamlRestTest" }.configureEach {
2121
}
2222

2323
tasks.named('yamlRestTestTestingConventions').configure {
24-
baseClass 'org.elasticsearch.repositories.blobstore.testkit.AbstractSnapshotRepoTestKitRestTestCase'
24+
baseClass 'org.elasticsearch.repositories.blobstore.testkit.analyze.AbstractRepositoryAnalysisRestTestCase'
2525
baseClass 'org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase'
2626
}
2727

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
* 2.0.
66
*/
77

8-
package org.elasticsearch.repositories.blobstore.testkit.rest;
8+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
99

1010
import org.elasticsearch.common.settings.Settings;
11-
import org.elasticsearch.repositories.blobstore.testkit.AbstractSnapshotRepoTestKitRestTestCase;
1211
import org.elasticsearch.repositories.fs.FsRepository;
1312

14-
public class FsSnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
13+
public class FsRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
1514

1615
@Override
1716
protected String repositoryType() {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
package org.elasticsearch.repositories.blobstore.testkit;
7+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
88

99
import fixture.s3.S3HttpFixture;
1010

@@ -18,7 +18,7 @@
1818
import static org.hamcrest.Matchers.blankOrNullString;
1919
import static org.hamcrest.Matchers.not;
2020

21-
public class S3SnapshotRepoTestKitIT extends AbstractSnapshotRepoTestKitRestTestCase {
21+
public class S3RepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRestTestCase {
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* 2.0.
66
*/
77

8-
package org.elasticsearch.repositories.blobstore.testkit;
8+
package org.elasticsearch.repositories.blobstore.testkit.analyze;
99

1010
import org.elasticsearch.common.bytes.BytesArray;
1111
import org.elasticsearch.common.bytes.BytesReference;

0 commit comments

Comments
 (0)