github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove usages of TransportMessage (#126375)

Browse source 
This base class is kinda pointless: everywhere it's used we can either
be more specific (e.g. choosing between `TransportRequest` or
`TransportResponse`) or more general (e.g. choosing `Writeable`). This
commit removes all the usages apart from the `extends` clauses of its
direct descendants.
This commit is contained in:
David Turner 2025-04-07 18:50:28 +01:00 • committed by GitHub
parent 212971a435
commit 5dc7ab77b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/transport/InboundHandler.java
View file

@ -32,8 +32,8 @@ import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
/**
* Handles inbound messages by first deserializing a {@link TransportMessage} from an {@link InboundMessage} and then passing
* it to the appropriate handler.
* Handles inbound messages by first deserializing a {@link TransportRequest} or {@link TransportResponse} from an {@link InboundMessage}
* and then passing it to the appropriate handler.
*/
public class InboundHandler {

16
server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java
View file

@ -36,6 +36,7 @@ import org.elasticsearch.common.util.concurrent.AtomicArray;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.EsExecutors.TaskTrackingConfig;
import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor;
import org.elasticsearch.core.RefCounted;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.lucene.grouping.TopFieldGroups;
import org.elasticsearch.search.DocValueFormat;
@ -70,7 +71,6 @@ import org.elasticsearch.tasks.TaskId;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.threadpool.TestThreadPool;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportMessage;
import org.junit.After;
import org.junit.Before;
@ -177,7 +177,7 @@ public class SearchPhaseControllerTests extends ESTestCase {
ScoreDoc[] sortedDocs = SearchPhaseController.sortDocs(true, topDocsList, from, size, reducedCompletionSuggestions).scoreDocs();
assertThat(sortedDocs.length, equalTo(accumulatedLength));
} finally {
results.asList().forEach(TransportMessage::decRef);
results.asList().forEach(RefCounted::decRef);
}
}
@ -211,7 +211,7 @@ public class SearchPhaseControllerTests extends ESTestCase {
}
sortedDocs = SearchPhaseController.sortDocs(ignoreFrom, topDocsList, from, size, Collections.emptyList()).scoreDocs();
} finally {
results.asList().forEach(TransportMessage::decRef);
results.asList().forEach(RefCounted::decRef);
}
results = generateSeededQueryResults(randomSeed, nShards, Collections.emptyList(), queryResultSize, useConstantScore);
try {
@ -231,7 +231,7 @@ public class SearchPhaseControllerTests extends ESTestCase {
assertEquals(sortedDocs[i].score, sortedDocs2[i].score, 0.0f);
}
} finally {
results.asList().forEach(TransportMessage::decRef);
results.asList().forEach(RefCounted::decRef);
}
}
@ -342,10 +342,10 @@ public class SearchPhaseControllerTests extends ESTestCase {
assertThat(mergedResponse.profile(), is(anEmptyMap()));
}
} finally {
fetchResults.asList().forEach(TransportMessage::decRef);
fetchResults.asList().forEach(RefCounted::decRef);
}
} finally {
queryResults.asList().forEach(TransportMessage::decRef);
queryResults.asList().forEach(RefCounted::decRef);
}
}
}
@ -419,11 +419,11 @@ public class SearchPhaseControllerTests extends ESTestCase {
assertThat(mergedResponse.hits().getHits().length, equalTo(reducedQueryPhase.sortedTopDocs().scoreDocs().length));
assertThat(mergedResponse.profile(), is(anEmptyMap()));
} finally {
fetchResults.asList().forEach(TransportMessage::decRef);
fetchResults.asList().forEach(RefCounted::decRef);
}
} finally {
queryResults.asList().forEach(TransportMessage::decRef);
queryResults.asList().forEach(RefCounted::decRef);
}
}
}

4
server/src/test/java/org/elasticsearch/search/profile/SearchProfileResultsBuilderTests.java
View file

@ -10,12 +10,12 @@
package org.elasticsearch.search.profile;
import org.elasticsearch.common.util.Maps;
import org.elasticsearch.core.RefCounted;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.SearchShardTarget;
import org.elasticsearch.search.fetch.FetchSearchResult;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.transport.TransportMessage;
import java.util.List;
import java.util.Map;
@ -77,7 +77,7 @@ public class SearchProfileResultsBuilderTests extends ESTestCase {
equalTo((long) searchPhase.size())
);
} finally {
fetchPhase.forEach(TransportMessage::decRef);
fetchPhase.forEach(RefCounted::decRef);
}
}

3
server/src/test/java/org/elasticsearch/transport/InboundDecoderTests.java
View file

@ -15,6 +15,7 @@ import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.bytes.ReleasableBytesReference;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.RecyclerBytesStreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.util.concurrent.ThreadContext;
@ -269,7 +270,7 @@ public class InboundDecoderTests extends ESTestCase {
Compression.Scheme scheme = randomFrom(Compression.Scheme.DEFLATE, Compression.Scheme.LZ4);
try (RecyclerBytesStreamOutput os = new RecyclerBytesStreamOutput(recycler)) {
final TransportMessage transportMessage = isRequest
final Writeable transportMessage = isRequest
? new TestRequest(randomAlphaOfLength(100))
: new TestResponse(randomAlphaOfLength(100));
final BytesReference totalBytes = OutboundHandler.serialize(

4
server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java
View file

@ -159,7 +159,7 @@ public class TransportActionProxyTests extends ESTestCase {
TransportActionProxy.registerProxyAction(serviceC, "internal:test", cancellable, SimpleTestResponse::new);
// Node A -> Node B -> Node C: different versions - serialize the response
{
final List<TransportMessage> responses = Collections.synchronizedList(new ArrayList<>());
final List<TransportResponse> responses = Collections.synchronizedList(new ArrayList<>());
final CountDownLatch latch = new CountDownLatch(1);
serviceB.addRequestHandlingBehavior(
TransportActionProxy.getProxyAction("internal:test"),
@ -212,7 +212,7 @@ public class TransportActionProxyTests extends ESTestCase {
{
AbstractSimpleTransportTestCase.connectToNode(serviceD, nodeB);
final CountDownLatch latch = new CountDownLatch(1);
final List<TransportMessage> responses = Collections.synchronizedList(new ArrayList<>());
final List<TransportResponse> responses = Collections.synchronizedList(new ArrayList<>());
serviceB.addRequestHandlingBehavior(
TransportActionProxy.getProxyAction("internal:test"),
(handler, request, channel, task) -> handler.messageReceived(

8
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/AuthenticationFailureHandler.java
View file

@ -9,7 +9,7 @@ package org.elasticsearch.xpack.core.security.authc;
import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.http.HttpPreRequest;
import org.elasticsearch.transport.TransportMessage;
import org.elasticsearch.transport.TransportRequest;
/**
* A AuthenticationFailureHandler is responsible for the handling of a request that has failed authentication. This must
@ -51,7 +51,7 @@ public interface AuthenticationFailureHandler {
* @return ElasticsearchSecurityException with the appropriate headers and message
*/
ElasticsearchSecurityException failedAuthentication(
TransportMessage message,
TransportRequest message,
AuthenticationToken token,
String action,
ThreadContext context
@ -78,7 +78,7 @@ public interface AuthenticationFailureHandler {
* @param context The context of the request that failed authentication that could not be authenticated
* @return ElasticsearchSecurityException with the appropriate headers and message
*/
ElasticsearchSecurityException exceptionProcessingRequest(TransportMessage message, String action, Exception e, ThreadContext context);
ElasticsearchSecurityException exceptionProcessingRequest(TransportRequest message, String action, Exception e, ThreadContext context);
/**
* This method is called when a REST request is received and no authentication token could be extracted AND anonymous
@ -99,7 +99,7 @@ public interface AuthenticationFailureHandler {
* @param context The context of the request that failed authentication that could not be authenticated
* @return ElasticsearchSecurityException with the appropriate headers and message
*/
ElasticsearchSecurityException missingToken(TransportMessage message, String action, ThreadContext context);
ElasticsearchSecurityException missingToken(TransportRequest message, String action, ThreadContext context);
/**
* This method is called when anonymous access is enabled, a request does not pass authorization with the anonymous

8
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/DefaultAuthenticationFailureHandler.java
View file

@ -11,7 +11,7 @@ import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.http.HttpPreRequest;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.transport.TransportMessage;
import org.elasticsearch.transport.TransportRequest;
import org.elasticsearch.xpack.core.XPackField;
import java.util.ArrayList;
@ -98,7 +98,7 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur
@Override
public ElasticsearchSecurityException failedAuthentication(
TransportMessage message,
TransportRequest message,
AuthenticationToken token,
String action,
ThreadContext context
@ -118,7 +118,7 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur
@Override
public ElasticsearchSecurityException exceptionProcessingRequest(
TransportMessage message,
TransportRequest message,
String action,
Exception e,
ThreadContext context
@ -137,7 +137,7 @@ public class DefaultAuthenticationFailureHandler implements AuthenticationFailur
}
@Override
public ElasticsearchSecurityException missingToken(TransportMessage message, String action, ThreadContext context) {
public ElasticsearchSecurityException missingToken(TransportRequest message, String action, ThreadContext context) {
return createAuthenticationError("missing authentication credentials for action [{}]", null, action);
}

8
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/AuditUtil.java
View file

@ -13,7 +13,7 @@ import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.transport.TransportMessage;
import org.elasticsearch.transport.TransportRequest;
import java.io.IOException;
import java.util.Arrays;
@ -37,9 +37,9 @@ public class AuditUtil {
return "";
}
public static Set<String> indices(TransportMessage message) {
if (message instanceof IndicesRequest) {
return arrayToSetOrNull(((IndicesRequest) message).indices());
public static Set<String> indices(TransportRequest message) {
if (message instanceof IndicesRequest indicesRequest) {
return arrayToSetOrNull(indicesRequest.indices());
}
return null;
}

6
x-pack/qa/security-example-spi-extension/src/main/java/org/elasticsearch/example/realm/CustomAuthenticationFailureHandler.java
View file

@ -9,7 +9,7 @@ package org.elasticsearch.example.realm;
import org.elasticsearch.ElasticsearchSecurityException;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.http.HttpPreRequest;
import org.elasticsearch.transport.TransportMessage;
import org.elasticsearch.transport.TransportRequest;
import org.elasticsearch.xpack.core.security.authc.AuthenticationToken;
import org.elasticsearch.xpack.core.security.authc.DefaultAuthenticationFailureHandler;
@ -31,7 +31,7 @@ public class CustomAuthenticationFailureHandler extends DefaultAuthenticationFai
@Override
public ElasticsearchSecurityException failedAuthentication(
TransportMessage message,
TransportRequest message,
AuthenticationToken token,
String action,
ThreadContext context
@ -51,7 +51,7 @@ public class CustomAuthenticationFailureHandler extends DefaultAuthenticationFai
}
@Override
public ElasticsearchSecurityException missingToken(TransportMessage message, String action, ThreadContext context) {
public ElasticsearchSecurityException missingToken(TransportRequest message, String action, ThreadContext context) {
ElasticsearchSecurityException e = super.missingToken(message, action, context);
// set a custom header
e.addHeader("WWW-Authenticate", "custom-challenge");