Skip to content

Commit

Permalink
[Refactor] Network and Transport common classes to Libraries (#9073) (#…
Browse files Browse the repository at this point in the history 
…9078)

This commit refactors the following network and transport libraries to
the opensearch common and core libraries respectively:

* o.o.common.network.Cidrs -> :libs:opensearch-common
* o.o.common.network.InetAddresses -> :libs:opensearch-common
* o.o.common.network.NetworkAddress -> :libs:opensearch-common
* o.o.common.transport.NetworkExceptionHelper -> :libs:opensearch-common
* o.o.common.transport.PortsRange -> :libs:opensearch-common

* o.o.common.transport.TransportAddress -> :libs:opensearch-core
* o.o.common.transport.BoundTransportAddress -> :libs:opensearch-core
* o.o.transport.TransportMessage -> :libs:opensearch-core
* o.o.transport.TransportResponse -> :libs:opensearch-core

The purpose is to reduce the change surface area of the core APIs to
minimize impact to downstream consumers while moving toward establishing
a formal API for cloud native or serverless implementations.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 8afb22a)
  • Loading branch information
@nknize
nknize committed Aug 2, 2023
1 parent 21723f0 commit fc256bb
Show file tree
Hide file tree
Showing 218 changed files with 285 additions and 228 deletions.
2 changes: 1 addition & 1 deletion benchmarks/src/main/java/org/opensearch/benchmark/routing/allocation/Allocators.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.set.Sets;
import org.opensearch.gateway.GatewayAllocator;
import org.opensearch.snapshots.EmptySnapshotsInfoService;
Expand Down
2 changes: 1 addition & 1 deletion ...t/rest-high-level/src/test/java/org/opensearch/client/tasks/CancelTasksResponseTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.xcontent.XContentBuilder;
import org.opensearch.core.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentType;
Expand Down
0 .../org/opensearch/common/network/Cidrs.java → .../org/opensearch/common/network/Cidrs.java
View file
File renamed without changes.
0 ...nsearch/common/network/InetAddresses.java → ...nsearch/common/network/InetAddresses.java
View file
File renamed without changes.
0 ...search/common/network/NetworkAddress.java → ...search/common/network/NetworkAddress.java
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions libs/common/src/main/java/org/opensearch/common/network/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

/** common network layer classes used across the code base */
package org.opensearch.common.network;
0 ...mon/transport/NetworkExceptionHelper.java → ...mon/transport/NetworkExceptionHelper.java
View file
File renamed without changes.
0 ...ensearch/common/transport/PortsRange.java → ...ensearch/common/transport/PortsRange.java
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...search/common/transport/package-info.java → ...search/common/transport/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
* compatible open source license.
*/

/** Base Transport utility package. */
/** common transport layer classes used across the code base */
package org.opensearch.common.transport;
0 ...opensearch/common/network/CidrsTests.java → ...opensearch/common/network/CidrsTests.java
View file
File renamed without changes.
0 ...ch/common/network/InetAddressesTests.java → ...ch/common/network/InetAddressesTests.java
View file
File renamed without changes.
0 ...h/common/network/NetworkAddressTests.java → ...h/common/network/NetworkAddressTests.java
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...mmon/transport/BoundTransportAddress.java → ...mmon/transport/BoundTransportAddress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
* GitHub history for details.
*/

package org.opensearch.common.transport;
package org.opensearch.core.common.transport;

import org.opensearch.common.network.InetAddresses;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.common.network.InetAddresses;

import java.io.IOException;

Expand Down
4 changes: 2 additions & 2 deletions ...ch/common/transport/TransportAddress.java → ...re/common/transport/TransportAddress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
* GitHub history for details.
*/

package org.opensearch.common.transport;
package org.opensearch.core.common.transport;

import org.opensearch.common.network.NetworkAddress;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.core.xcontent.ToXContentFragment;
import org.opensearch.core.xcontent.XContentBuilder;

Expand Down
10 changes: 10 additions & 0 deletions libs/core/src/main/java/org/opensearch/core/common/transport/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

/** Common / Base Transport classes used to implement the OpenSearch transport layer */
package org.opensearch.core.common.transport;
4 changes: 2 additions & 2 deletions ...pensearch/transport/TransportMessage.java → ...arch/core/transport/TransportMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
* GitHub history for details.
*/

package org.opensearch.transport;
package org.opensearch.core.transport;

import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.Writeable;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;

/**
* Message over the transport interface
Expand Down
2 changes: 1 addition & 1 deletion ...ensearch/transport/TransportResponse.java → ...rch/core/transport/TransportResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* GitHub history for details.
*/

package org.opensearch.transport;
package org.opensearch.core.transport;

import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
Expand Down
10 changes: 10 additions & 0 deletions libs/core/src/main/java/org/opensearch/core/transport/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

/** Core Transport Layer classes used across the OpenSearch core */
package org.opensearch.core.transport;
2 changes: 1 addition & 1 deletion ...es/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
Expand Down
2 changes: 1 addition & 1 deletion modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import org.opensearch.client.Client;
import org.opensearch.core.common.bytes.BytesArray;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
import org.opensearch.http.HttpInfo;
import org.opensearch.index.query.QueryBuilders;
Expand Down
2 changes: 1 addition & 1 deletion ...src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.common.unit.ByteSizeUnit;
import org.opensearch.core.common.unit.ByteSizeValue;
import org.opensearch.http.HttpServerTransport;
Expand Down
2 changes: 1 addition & 1 deletion ...rt-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.util.ReferenceCounted;
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.http.HttpServerTransport;
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
import org.opensearch.test.OpenSearchIntegTestCase.Scope;
Expand Down
4 changes: 2 additions & 2 deletions ...usterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.BoundTransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.BoundTransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
import org.opensearch.test.OpenSearchIntegTestCase.Scope;
import org.opensearch.test.junit.annotations.Network;
Expand Down
4 changes: 2 additions & 2 deletions ...rnalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.network.NetworkUtils;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.BoundTransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.BoundTransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.test.OpenSearchIntegTestCase;
import org.opensearch.transport.Netty4Plugin;
import org.opensearch.transport.TransportInfo;
Expand Down
2 changes: 1 addition & 1 deletion modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.MockBigArrays;
import org.opensearch.common.util.MockPageCacheRecycler;
import org.opensearch.common.util.concurrent.ThreadContext;
Expand Down
2 changes: 1 addition & 1 deletion ...port-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.MockBigArrays;
import org.opensearch.common.util.MockPageCacheRecycler;
import org.opensearch.http.HttpPipelinedRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...sport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.MockBigArrays;
Expand Down
2 changes: 1 addition & 1 deletion ...tty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.MockPageCacheRecycler;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
Expand Down
2 changes: 1 addition & 1 deletion ...port-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.common.util.io.IOUtils;
import org.opensearch.common.util.net.NetUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...sterTest/java/org/opensearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.discovery.azure.classic.AzureSeedHostsProvider;
import org.opensearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin;
import org.opensearch.plugins.Plugin;
Expand Down
2 changes: 1 addition & 1 deletion ...-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.opensearch.common.network.NetworkAddress;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.common.Strings;
import org.opensearch.discovery.SeedHostsProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...ins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2SeedHostsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.util.Supplier;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.SingleObjectCache;
import org.opensearch.discovery.SeedHostsProvider;
Expand Down
2 changes: 1 addition & 1 deletion plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2DiscoveryTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.opensearch.common.io.Streams;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.test.transport.MockTransportService;
Expand Down
2 changes: 1 addition & 1 deletion plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2RetriesTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.opensearch.common.io.Streams;
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.PageCacheRecycler;
import org.opensearch.discovery.SeedHostsProvider;
import org.opensearch.discovery.SeedHostsResolver;
Expand Down
2 changes: 1 addition & 1 deletion plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Setting.Property;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.common.Strings;
import org.opensearch.discovery.SeedHostsProvider;
Expand Down
2 changes: 1 addition & 1 deletion plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceDiscoveryTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.opensearch.cloud.gce.GceMetadataService;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.transport.MockTransportService;
import org.opensearch.threadpool.TestThreadPool;
Expand Down
2 changes: 1 addition & 1 deletion ...s/transport-nio/src/internalClusterTest/java/org/opensearch/http/nio/NioPipeliningIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import io.netty.handler.codec.http.FullHttpResponse;
import org.opensearch.NioIntegTestCase;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.http.HttpServerTransport;
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
import org.opensearch.test.OpenSearchIntegTestCase.Scope;
Expand Down
2 changes: 1 addition & 1 deletion plugins/transport-nio/src/test/java/org/opensearch/http/nio/NioHttpServerTransportTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.MockBigArrays;
Expand Down
2 changes: 1 addition & 1 deletion ...ins/transport-nio/src/test/java/org/opensearch/transport/nio/SimpleNioTransportTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.common.util.MockPageCacheRecycler;
import org.opensearch.common.util.io.IOUtils;
import org.opensearch.common.util.net.NetUtils;
Expand Down
2 changes: 1 addition & 1 deletion .../opensearch/action/support/replication/TransportReplicationActionRetryOnClosedNodeIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import org.opensearch.transport.TransportInterceptor;
import org.opensearch.transport.TransportRequest;
import org.opensearch.transport.TransportRequestOptions;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;
import org.opensearch.transport.TransportResponseHandler;
import org.opensearch.transport.TransportService;

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/ActionListenerResponseHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportResponseHandler;
import org.opensearch.transport.TransportException;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.io.IOException;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/ActionResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
package org.opensearch.action;

import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.opensearch.common.metrics.OperationStats;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.core.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.common.Strings;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/search/ClearScrollController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.opensearch.common.util.concurrent.CountDown;
import org.opensearch.core.common.Strings;
import org.opensearch.transport.Transport;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/search/DeletePitInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.opensearch.core.xcontent.ConstructingObjectParser;
import org.opensearch.core.xcontent.ToXContent;
import org.opensearch.core.xcontent.XContentBuilder;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/search/SearchTransportService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import org.opensearch.transport.TransportException;
import org.opensearch.transport.TransportRequest;
import org.opensearch.transport.TransportRequestOptions;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;
import org.opensearch.transport.TransportService;

import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/search/UpdatePitContextResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/support/ChannelActionListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.opensearch.action.ActionListener;
import org.opensearch.transport.TransportChannel;
import org.opensearch.transport.TransportRequest;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

/**
* Listener for transport channel actions
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/support/broadcast/BroadcastShardResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.index.shard.ShardId;
import org.opensearch.transport.TransportResponse;
import org.opensearch.core.transport.TransportResponse;

import java.io.IOException;

Expand Down
Loading

0 comments on commit fc256bb

Please sign in to comment.