Skip to content

Commit 48d3c50

Browse files
committed
Fixing build issues
1 parent 628d4c8 commit 48d3c50

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

server/src/main/java/org/opensearch/index/shard/IndexShard.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@
201201
import org.opensearch.indices.recovery.RecoverySettings;
202202
import org.opensearch.indices.recovery.RecoveryState;
203203
import org.opensearch.indices.recovery.RecoveryTarget;
204-
import org.opensearch.indices.replication.checkpoint.*;
204+
import org.opensearch.indices.replication.checkpoint.MergedSegmentCheckpoint;
205+
import org.opensearch.indices.replication.checkpoint.MergedSegmentPublisher;
206+
import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
207+
import org.opensearch.indices.replication.checkpoint.RemoteStoreMergedSegmentCheckpoint;
208+
import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
205209
import org.opensearch.indices.replication.common.ReplicationTimer;
206210
import org.opensearch.repositories.RepositoriesService;
207211
import org.opensearch.repositories.Repository;

server/src/test/java/org/opensearch/indices/replication/ActiveMergesSegmentRegistryTests.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
19
package org.opensearch.indices.replication;
210

3-
import org.junit.After;
411
import org.junit.Before;
5-
import org.junit.BeforeClass;
612
import org.junit.Test;
7-
import org.junit.runner.OrderWith;
813
import org.opensearch.index.store.RemoteSegmentStoreDirectory.UploadedSegmentMetadata;
914

1015
import java.util.Map;
@@ -13,8 +18,14 @@
1318
import java.util.concurrent.Executors;
1419
import java.util.concurrent.TimeUnit;
1520

16-
import static org.junit.Assert.*;
17-
import static org.mockito.Mockito.*;
21+
import static org.junit.Assert.assertSame;
22+
import static org.junit.Assert.assertEquals;
23+
import static org.junit.Assert.assertTrue;
24+
import static org.junit.Assert.assertFalse;
25+
import static org.junit.Assert.assertNull;
26+
import static org.mockito.Mockito.mock;
27+
import static org.mockito.Mockito.when;
28+
1829

1930
public class ActiveMergesSegmentRegistryTests {
2031

0 commit comments

Comments
 (0)