Skip to content

Commit 3e54dfe

Browse files
rlubkerlubke
committed
HttpTransactionContext renamed to HttpTxContext.
1 parent 2f6f0d0 commit 3e54dfe

13 files changed

+90
-91
lines changed

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.glassfish.grizzly.filterchain.FilterChainContext;
3535
import org.glassfish.grizzly.http.HttpContent;
3636
import org.glassfish.grizzly.http.HttpHeader;
37-
import org.glassfish.grizzly.http.HttpRequestPacket;
3837
import org.glassfish.grizzly.http.HttpResponsePacket;
3938
import org.glassfish.grizzly.http.ProcessingState;
4039
import org.glassfish.grizzly.http.Protocol;
@@ -92,16 +91,16 @@ public final class EventHandler {
9291

9392
public void exceptionOccurred(FilterChainContext ctx, Throwable error) {
9493

95-
HttpTransactionContext.get(ctx.getConnection()).abort(error);
94+
HttpTxContext.get(ctx.getConnection()).abort(error);
9695

9796
}
9897

9998

10099
public void onHttpContentParsed(HttpContent content,
101100
FilterChainContext ctx) {
102101

103-
final HttpTransactionContext context =
104-
HttpTransactionContext.get(ctx.getConnection());
102+
final HttpTxContext context =
103+
HttpTxContext.get(ctx.getConnection());
105104
final AsyncHandler handler = context.getHandler();
106105
if (handler != null && context.getCurrentState() != ABORT) {
107106
try {
@@ -119,17 +118,17 @@ public void onHttpContentParsed(HttpContent content,
119118

120119
@SuppressWarnings("UnusedParameters")
121120
public void onHttpHeadersEncoded(HttpHeader httpHeader, FilterChainContext ctx) {
122-
final HttpTransactionContext context =
123-
HttpTransactionContext.get(ctx.getConnection());
121+
final HttpTxContext context =
122+
HttpTxContext.get(ctx.getConnection());
124123
final AsyncHandler handler = context.getHandler();
125124
if (handler instanceof TransferCompletionHandler) {
126125
((TransferCompletionHandler) handler).onHeaderWriteCompleted();
127126
}
128127
}
129128

130129
public void onHttpContentEncoded(HttpContent content, FilterChainContext ctx) {
131-
final HttpTransactionContext context =
132-
HttpTransactionContext.get(ctx.getConnection());
130+
final HttpTxContext context =
131+
HttpTxContext.get(ctx.getConnection());
133132
final AsyncHandler handler = context.getHandler();
134133
if (handler instanceof TransferCompletionHandler) {
135134
final int written = content.getContent().remaining();
@@ -147,8 +146,8 @@ public void onInitialLineParsed(HttpHeader httpHeader,
147146
return;
148147
}
149148
final Connection connection = ctx.getConnection();
150-
final HttpTransactionContext context =
151-
HttpTransactionContext.get(connection);
149+
final HttpTxContext context =
150+
HttpTxContext.get(connection);
152151
final int status = ((HttpResponsePacket) httpHeader).getStatus();
153152
if (HttpStatus.CONINTUE_100.statusMatches(status)) {
154153
ctx.notifyUpstream(new ContinueEvent(context));
@@ -222,8 +221,8 @@ public void onHttpHeaderError(final HttpHeader httpHeader,
222221

223222
t.printStackTrace();
224223
httpHeader.setSkipRemainder(true);
225-
final HttpTransactionContext context =
226-
HttpTransactionContext.get(ctx.getConnection());
224+
final HttpTxContext context =
225+
HttpTxContext.get(ctx.getConnection());
227226
context.abort(t);
228227
}
229228

@@ -234,7 +233,7 @@ public void onHttpHeadersParsed(HttpHeader httpHeader,
234233
//super.onHttpHeadersParsed(httpHeader, ctx);
235234
GrizzlyAsyncHttpProvider.LOGGER.debug("RESPONSE: {}", httpHeader);
236235
processKeepAlive(ctx.getConnection(), httpHeader);
237-
final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
236+
final HttpTxContext context = HttpTxContext.get(ctx.getConnection());
238237

239238
if (httpHeader.isSkipRemainder()) {
240239
return;
@@ -270,10 +269,10 @@ public void onHttpHeadersParsed(HttpHeader httpHeader,
270269
final Connection c =
271270
m.obtainConnection(newRequest,
272271
context.getFuture());
273-
final HttpTransactionContext newContext =
272+
final HttpTxContext newContext =
274273
context.copy();
275274
context.setFuture(null);
276-
HttpTransactionContext.set(c, newContext);
275+
HttpTxContext.set(c, newContext);
277276
context.getProvider().execute(c,
278277
newRequest,
279278
newHandler,
@@ -369,7 +368,7 @@ public boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx)
369368

370369
final HttpResponsePacket response =
371370
(HttpResponsePacket) httpHeader;
372-
final HttpTransactionContext context = HttpTransactionContext.get(
371+
final HttpTxContext context = HttpTxContext.get(
373372
ctx.getConnection());
374373
cleanup(ctx);
375374
final AsyncHandler handler = context.getHandler();
@@ -405,7 +404,7 @@ private static void processKeepAlive(final Connection c,
405404
}
406405

407406

408-
private static GrizzlyWebSocketAdapter createWebSocketAdapter(final HttpTransactionContext context) {
407+
private static GrizzlyWebSocketAdapter createWebSocketAdapter(final HttpTxContext context) {
409408
SimpleWebSocket ws = new SimpleWebSocket(context.getProtocolHandler());
410409
AsyncHttpProviderConfig config = context.getProvider().getClientConfig().getAsyncHttpProviderConfig();
411410
boolean bufferFragments = true;
@@ -417,7 +416,7 @@ private static GrizzlyWebSocketAdapter createWebSocketAdapter(final HttpTransact
417416
return new GrizzlyWebSocketAdapter(ws, bufferFragments);
418417
}
419418

420-
private static boolean isRedirectAllowed(final HttpTransactionContext ctx) {
419+
private static boolean isRedirectAllowed(final HttpTxContext ctx) {
421420
boolean allowed = ctx.getRequest().isRedirectEnabled();
422421
if (ctx.getRequest().isRedirectOverrideSet()) {
423422
return allowed;
@@ -428,12 +427,12 @@ private static boolean isRedirectAllowed(final HttpTransactionContext ctx) {
428427
return allowed;
429428
}
430429

431-
private static HttpTransactionContext cleanup(final FilterChainContext ctx) {
430+
private static HttpTxContext cleanup(final FilterChainContext ctx) {
432431

433432
final Connection c = ctx.getConnection();
434-
final HttpTransactionContext context =
435-
HttpTransactionContext.get(c);
436-
HttpTransactionContext.set(c, null);
433+
final HttpTxContext context =
434+
HttpTxContext.get(c);
435+
HttpTxContext.set(c, null);
437436
if (!Utils.isIgnored(ctx.getConnection())) {
438437
final ConnectionManager manager =
439438
context.getProvider().getConnectionManager();
@@ -452,7 +451,7 @@ private static HttpTransactionContext cleanup(final FilterChainContext ctx) {
452451
}
453452

454453

455-
private static boolean redirectCountExceeded(final HttpTransactionContext context) {
454+
private static boolean redirectCountExceeded(final HttpTxContext context) {
456455

457456
return (context.getRedirectCount().get() > context.getMaxRedirectCount());
458457

@@ -474,7 +473,7 @@ public static boolean isRedirect(final int status) {
474473

475474
public static Request newRequest(final URI uri,
476475
final HttpResponsePacket response,
477-
final HttpTransactionContext ctx,
476+
final HttpTxContext ctx,
478477
boolean asGet) {
479478

480479
final RequestBuilder builder = new RequestBuilder(ctx.getRequest());

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/FeedableBodyGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void run() {
174174
try {
175175
feeder.flush();
176176
} catch (IOException ioe) {
177-
HttpTransactionContext ctx = HttpTransactionContext.get(c);
177+
HttpTxContext ctx = HttpTxContext.get(c);
178178
ctx.abort(ioe);
179179
}
180180
}
@@ -353,10 +353,10 @@ private static void block(final Connection c,
353353
future.get();
354354
}
355355
} catch (ExecutionException e) {
356-
HttpTransactionContext ctx = HttpTransactionContext.get(c);
356+
HttpTxContext ctx = HttpTxContext.get(c);
357357
ctx.abort(e.getCause());
358358
} catch (Exception e) {
359-
HttpTransactionContext ctx = HttpTransactionContext.get(c);
359+
HttpTxContext ctx = HttpTxContext.get(c);
360360
ctx.abort(e);
361361
}
362362
}
@@ -579,7 +579,7 @@ public void onWritePossible() throws Exception {
579579
public void onError(Throwable t) {
580580
c.setMaxAsyncWriteQueueSize(
581581
feedableBodyGenerator.origMaxPendingBytes);
582-
HttpTransactionContext ctx = HttpTransactionContext.get(c);
582+
HttpTxContext ctx = HttpTxContext.get(c);
583583
ctx.abort(t);
584584
}
585585

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpProvider.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ public <T> ListenableFuture<T> execute(final Connection c,
241241
final AsyncHandler<T> handler,
242242
final GrizzlyResponseFuture<T> future) {
243243
Utils.addRequestInFlight(c);
244-
if (HttpTransactionContext.get(c) == null) {
245-
HttpTransactionContext.create(this, future, request, handler, c);
244+
if (HttpTxContext.get(c) == null) {
245+
HttpTxContext.create(this, future, request, handler, c);
246246
}
247247
c.write(request, createWriteCompletionHandler(future));
248248

@@ -271,8 +271,8 @@ void initializeTransport(final AsyncHttpClientConfig clientConfig) {
271271
new IdleTimeoutFilter.TimeoutResolver() {
272272
@Override
273273
public long getTimeout(FilterChainContext ctx) {
274-
final HttpTransactionContext context =
275-
HttpTransactionContext.get(ctx.getConnection());
274+
final HttpTxContext context =
275+
HttpTxContext.get(ctx.getConnection());
276276
if (context != null) {
277277
if (context.isWSRequest()) {
278278
return clientConfig.getWebSocketIdleTimeoutInMs();
@@ -495,9 +495,9 @@ public void updated(WriteResult result) {
495495

496496
void timeout(final Connection c) {
497497

498-
final HttpTransactionContext context = HttpTransactionContext.get(c);
498+
final HttpTxContext context = HttpTxContext.get(c);
499499
if (context != null) {
500-
HttpTransactionContext.set(c, null);
500+
HttpTxContext.set(c, null);
501501
context.abort(new TimeoutException("Timeout exceeded"));
502502
}
503503

@@ -513,7 +513,7 @@ public boolean sendRequest(final FilterChainContext ctx,
513513
boolean isWriteComplete = true;
514514

515515
if (requestHasEntityBody(request)) {
516-
final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
516+
final HttpTxContext context = HttpTxContext.get(ctx.getConnection());
517517
BodyHandler handler = bodyHandlerFactory.getBodyHandler(request);
518518
if (requestPacket.getHeaders().contains(Header.Expect)
519519
&& requestPacket.getHeaders().getValue(1).equalsIgnoreCase("100-Continue")) {

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/HttpTransactionContext.java renamed to ‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/HttpTxContext.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
import static org.asynchttpclient.providers.grizzly.statushandler.StatusHandler.InvocationStatus;
3131

32-
public final class HttpTransactionContext {
32+
public final class HttpTxContext {
3333

34-
private static final Attribute<HttpTransactionContext> REQUEST_STATE_ATTR =
35-
Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(HttpTransactionContext.class.getName());
34+
private static final Attribute<HttpTxContext> REQUEST_STATE_ATTR =
35+
Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(HttpTxContext.class.getName());
3636

3737
private final AtomicInteger redirectCount = new AtomicInteger(0);
3838

@@ -62,10 +62,10 @@ public final class HttpTransactionContext {
6262
// -------------------------------------------------------- Constructors
6363

6464

65-
private HttpTransactionContext(GrizzlyAsyncHttpProvider provider,
66-
final GrizzlyResponseFuture future,
67-
final Request request,
68-
final AsyncHandler handler) {
65+
private HttpTxContext(final GrizzlyAsyncHttpProvider provider,
66+
final GrizzlyResponseFuture future,
67+
final Request request,
68+
final AsyncHandler handler) {
6969
this.provider = provider;
7070

7171
this.future = future;
@@ -82,7 +82,7 @@ private HttpTransactionContext(GrizzlyAsyncHttpProvider provider,
8282

8383

8484
public static void set(final AttributeStorage storage,
85-
final HttpTransactionContext httpTransactionState) {
85+
final HttpTxContext httpTransactionState) {
8686

8787
if (httpTransactionState == null) {
8888
REQUEST_STATE_ATTR.remove(storage);
@@ -92,20 +92,20 @@ public static void set(final AttributeStorage storage,
9292

9393
}
9494

95-
public static HttpTransactionContext get(final AttributeStorage storage) {
95+
public static HttpTxContext get(final AttributeStorage storage) {
9696

9797
return REQUEST_STATE_ATTR.get(storage);
9898

9999
}
100100

101101

102-
public static HttpTransactionContext create(final GrizzlyAsyncHttpProvider provider,
102+
public static HttpTxContext create(final GrizzlyAsyncHttpProvider provider,
103103
final GrizzlyResponseFuture future,
104104
final Request request,
105105
final AsyncHandler handler,
106106
final AttributeStorage storage) {
107-
final HttpTransactionContext context =
108-
new HttpTransactionContext(provider, future, request, handler);
107+
final HttpTxContext context =
108+
new HttpTxContext(provider, future, request, handler);
109109
set(storage, context);
110110
return context;
111111
}
@@ -256,9 +256,9 @@ public void setWebSocket(WebSocket webSocket) {
256256
// ------------------------------------------------- Package Private Methods
257257

258258

259-
public HttpTransactionContext copy() {
260-
final HttpTransactionContext newContext =
261-
new HttpTransactionContext(provider,
259+
public HttpTxContext copy() {
260+
final HttpTxContext newContext =
261+
new HttpTxContext(provider,
262262
future,
263263
request,
264264
handler);

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/bodyhandler/FileBodyHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.asynchttpclient.AsyncHandler;
1717
import org.asynchttpclient.Request;
1818
import org.asynchttpclient.listener.TransferCompletionHandler;
19-
import org.asynchttpclient.providers.grizzly.HttpTransactionContext;
19+
import org.asynchttpclient.providers.grizzly.HttpTxContext;
2020
import org.glassfish.grizzly.Buffer;
2121
import org.glassfish.grizzly.EmptyCompletionHandler;
2222
import org.glassfish.grizzly.FileTransfer;
@@ -55,7 +55,7 @@ public boolean doHandle(final FilterChainContext ctx,
5555

5656
final File f = request.getFile();
5757
requestPacket.setContentLengthLong(f.length());
58-
final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
58+
final HttpTxContext context = HttpTxContext.get(ctx.getConnection());
5959
if (!SEND_FILE_SUPPORT || requestPacket.isSecure()) {
6060
final FileInputStream fis = new FileInputStream(request.getFile());
6161
final MemoryManager mm = ctx.getMemoryManager();
@@ -109,7 +109,7 @@ public void completed(WriteResult result) {
109109
// --------------------------------------------------------- Private Methods
110110

111111

112-
private static void notifyHandlerIfNeeded(final HttpTransactionContext context,
112+
private static void notifyHandlerIfNeeded(final HttpTxContext context,
113113
final HttpRequestPacket requestPacket,
114114
final WriteResult writeResult) {
115115
final AsyncHandler handler = context.getHandler();

‎providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.asynchttpclient.listener.TransferCompletionHandler.TransferAdapter;
2929
import org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider;
3030
import org.asynchttpclient.providers.grizzly.GrizzlyResponseFuture;
31-
import org.asynchttpclient.providers.grizzly.HttpTransactionContext;
31+
import org.asynchttpclient.providers.grizzly.HttpTxContext;
3232
import org.asynchttpclient.providers.grizzly.Utils;
3333
import org.asynchttpclient.providers.grizzly.bodyhandler.ExpectHandler;
3434
import org.asynchttpclient.providers.grizzly.filters.events.ContinueEvent;
@@ -207,7 +207,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
207207
final FilterChainContext ctx)
208208
throws IOException {
209209

210-
final HttpTransactionContext httpCtx = HttpTransactionContext.get(ctx.getConnection());
210+
final HttpTxContext httpCtx = HttpTxContext.get(ctx.getConnection());
211211

212212
if (checkProxyAuthFailure(ctx, httpCtx)) {
213213
return true;
@@ -218,7 +218,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
218218

219219
// If the request is secure, check to see if an error occurred during
220220
// the handshake. We have to do this here, as the error would occur
221-
// out of the scope of a HttpTransactionContext so there would be
221+
// out of the scope of a HttpTxContext so there would be
222222
// no good way to communicate the problem to the caller.
223223
if (secure && checkHandshakeError(ctx, httpCtx)) {
224224
return true;
@@ -323,7 +323,7 @@ private static void initTransferCompletionHandler(final Request request,
323323
}
324324

325325
private static boolean checkHandshakeError(final FilterChainContext ctx,
326-
final HttpTransactionContext httpCtx) {
326+
final HttpTxContext httpCtx) {
327327
Throwable t = getHandshakeError(ctx.getConnection());
328328
if (t != null) {
329329
httpCtx.abort(t);
@@ -333,7 +333,7 @@ private static boolean checkHandshakeError(final FilterChainContext ctx,
333333
}
334334

335335
private static boolean checkProxyAuthFailure(final FilterChainContext ctx,
336-
final HttpTransactionContext httpCtx) {
336+
final HttpTxContext httpCtx) {
337337
final Boolean failed = PROXY_AUTH_FAILURE.get(ctx.getConnection());
338338
if (failed != null && failed) {
339339
httpCtx.abort(new IllegalStateException("Unable to authenticate with proxy"));
@@ -384,7 +384,7 @@ private static boolean isWSRequest(final String requestUri) {
384384
return (requestUri.charAt(0) == 'w' && requestUri.charAt(1) == 's');
385385
}
386386

387-
private static void convertToUpgradeRequest(final HttpTransactionContext ctx) {
387+
private static void convertToUpgradeRequest(final HttpTxContext ctx) {
388388
final int colonIdx = ctx.getRequestUrl().indexOf(':');
389389

390390
if (colonIdx < 2 || colonIdx > 3) {

0 commit comments

Comments
 (0)