-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow more versions to be in scope (#1051)
Allow more versions to be in scope - Loosen the ES 6.8 requirement to allow 6.X instead. - Fixed some code smells for SonarQube Signed-off-by: Peter Nied <[email protected]> Signed-off-by: Peter Nied <[email protected]>
- Loading branch information
Showing
14 changed files
with
90 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
RFS/src/main/java/org/opensearch/migrations/cluster/ClusterWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
RFS/src/test/java/org/opensearch/migrations/cluster/ClusterProviderRegistryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package org.opensearch.migrations.cluster; | ||
|
||
import org.opensearch.migrations.Version; | ||
import org.opensearch.migrations.bulkload.common.SourceRepo; | ||
import org.opensearch.migrations.bulkload.common.http.ConnectionContext; | ||
import org.opensearch.migrations.bulkload.models.DataFilterArgs; | ||
import org.opensearch.migrations.bulkload.version_es_6_8.SnapshotReader_ES_6_8; | ||
import org.opensearch.migrations.bulkload.version_os_2_11.RemoteWriter_OS_2_11; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.hamcrest.CoreMatchers.instanceOf; | ||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.mockito.Mockito.mock; | ||
|
||
public class ClusterProviderRegistryTest { | ||
|
||
@Test | ||
void testGetRemoteWriter_overridden() { | ||
var connectionContext = mock(ConnectionContext.class); | ||
var dataFilterArgs = mock(DataFilterArgs.class); | ||
|
||
var writer = ClusterProviderRegistry.getRemoteWriter(connectionContext, Version.fromString("OS 2.15"), dataFilterArgs); | ||
|
||
assertThat(writer, instanceOf(RemoteWriter_OS_2_11.class)); | ||
} | ||
|
||
@Test | ||
void testGetSnapshotReader_ES_6_4() { | ||
var sourceRepo = mock(SourceRepo.class); | ||
|
||
var reader = ClusterProviderRegistry.getSnapshotReader(Version.fromString("ES 6.4"), sourceRepo); | ||
|
||
assertThat(reader, instanceOf(SnapshotReader_ES_6_8.class)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters