This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c16e06575b Clean-up, formatting. No functional change.
c16e06575b is described below
commit c16e06575b52d9aa84dfbc63c0c9485c5a3a4a7b
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 5 16:44:03 2023 +0100
Clean-up, formatting. No functional change.
Preparation before back-porting RFC 918 priorities.
---
.../coyote/http2/ConnectionSettingsBase.java | 10 ++++-----
.../coyote/http2/ConnectionSettingsLocal.java | 2 +-
java/org/apache/coyote/http2/HpackEncoder.java | 8 +++----
java/org/apache/coyote/http2/Http2AsyncParser.java | 6 ++---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 26 +++++++++++-----------
java/org/apache/coyote/http2/Http2Protocol.java | 4 ++--
.../apache/coyote/http2/Http2UpgradeHandler.java | 12 +++++-----
java/org/apache/coyote/http2/Stream.java | 16 ++++++-------
java/org/apache/coyote/http2/StreamProcessor.java | 15 +++++++------
9 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
index 2fa4100f20..eea078417c 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -48,8 +48,8 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
// Defaults (defined by Tomcat)
static final long DEFAULT_NO_RFC7540_PRIORITIES = 1;
- Map<Setting, Long> current = new ConcurrentHashMap<>();
- Map<Setting, Long> pending = new ConcurrentHashMap<>();
+ Map<Setting,Long> current = new ConcurrentHashMap<>();
+ Map<Setting,Long> pending = new ConcurrentHashMap<>();
ConnectionSettingsBase(String connectionId) {
@@ -210,9 +210,9 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
private void validateMaxFrameSize(long maxFrameSize) throws T {
if (maxFrameSize < MIN_MAX_FRAME_SIZE || maxFrameSize >
MAX_MAX_FRAME_SIZE) {
- String msg =
sm.getString("connectionSettings.maxFrameSizeInvalid", connectionId,
- Long.toString(maxFrameSize),
Integer.toString(MIN_MAX_FRAME_SIZE),
- Integer.toString(MAX_MAX_FRAME_SIZE));
+ String msg =
+ sm.getString("connectionSettings.maxFrameSizeInvalid",
connectionId, Long.toString(maxFrameSize),
+ Integer.toString(MIN_MAX_FRAME_SIZE),
Integer.toString(MAX_MAX_FRAME_SIZE));
throwException(msg, Http2Error.PROTOCOL_ERROR);
}
}
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
b/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
index 8fecf37136..372be80223 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
@@ -61,7 +61,7 @@ class ConnectionSettingsLocal extends
ConnectionSettingsBase<IllegalArgumentExce
// Stream is zero
// Payload
int pos = 9;
- for (Map.Entry<Setting, Long> setting : pending.entrySet()) {
+ for (Map.Entry<Setting,Long> setting : pending.entrySet()) {
ByteUtil.setTwoBytes(result, pos, setting.getKey().getId());
pos += 2;
ByteUtil.setFourBytes(result, pos, setting.getValue().longValue());
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index a6e92a97c9..79b2a8a771 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -76,14 +76,14 @@ class HpackEncoder {
private int newMaxHeaderSize = -1; // if the max header size has been
changed
private int minNewMaxHeaderSize = -1; // records the smallest value of
newMaxHeaderSize, as per section 4.1
- private static final Map<String, TableEntry[]> ENCODING_STATIC_TABLE;
+ private static final Map<String,TableEntry[]> ENCODING_STATIC_TABLE;
private final Deque<TableEntry> evictionQueue = new ArrayDeque<>();
- private final Map<String, List<TableEntry>> dynamicTable = new
HashMap<>(); // TODO: use a custom data structure to
-
// reduce allocations
+ private final Map<String,List<TableEntry>> dynamicTable = new HashMap<>();
// TODO: use a custom data structure to
+
// reduce allocations
static {
- Map<String, TableEntry[]> map = new HashMap<>();
+ Map<String,TableEntry[]> map = new HashMap<>();
for (int i = 1; i < Hpack.STATIC_TABLE.length; ++i) {
Hpack.HeaderField m = Hpack.STATIC_TABLE[i];
TableEntry[] existing = map.get(m.name);
diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index 57f1cc27c0..1965123bc4 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -52,8 +52,8 @@ class Http2AsyncParser extends Http2Parser {
ByteBuffer preface = ByteBuffer.wrap(prefaceData);
ByteBuffer header = ByteBuffer.allocate(9);
ByteBuffer framePayload = ByteBuffer.allocate(input.getMaxFrameSize());
- PrefaceCompletionHandler handler = new
PrefaceCompletionHandler(webConnection, stream, prefaceData, preface,
- header, framePayload);
+ PrefaceCompletionHandler handler =
+ new PrefaceCompletionHandler(webConnection, stream,
prefaceData, preface, header, framePayload);
socketWrapper.read(BlockingMode.NON_BLOCK,
socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, null, handler,
handler, preface, header, framePayload);
}
@@ -164,7 +164,7 @@ class Http2AsyncParser extends Http2Parser {
}
}
- private class FrameCompletionHandler implements CompletionCheck,
CompletionHandler<Long, Void> {
+ private class FrameCompletionHandler implements CompletionCheck,
CompletionHandler<Long,Void> {
private final FrameType expected;
protected final ByteBuffer[] buffers;
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 5eee67451c..9372037f3d 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -55,7 +55,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
super(protocol, adapter, coyoteRequest, socketWrapper);
}
- private final CompletionHandler<Long, Void> errorCompletion = new
CompletionHandler<>() {
+ private final CompletionHandler<Long,Void> errorCompletion = new
CompletionHandler<>() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -65,7 +65,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
error.set(t);
}
};
- private final CompletionHandler<Long, Void> applicationErrorCompletion =
new CompletionHandler<>() {
+ private final CompletionHandler<Long,Void> applicationErrorCompletion =
new CompletionHandler<>() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -320,8 +320,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
sendfile.mappedBuffer = channel.map(MapMode.READ_ONLY,
sendfile.pos, sendfile.end - sendfile.pos);
}
// Reserve as much as possible right away
- int reservation = (sendfile.end - sendfile.pos >
Integer.MAX_VALUE) ? Integer.MAX_VALUE
- : (int) (sendfile.end - sendfile.pos);
+ int reservation = (sendfile.end - sendfile.pos >
Integer.MAX_VALUE) ? Integer.MAX_VALUE :
+ (int) (sendfile.end - sendfile.pos);
sendfile.streamReservation =
sendfile.stream.reserveWindowSize(reservation, true);
sendfile.connectionReservation =
reserveWindowSize(sendfile.stream, sendfile.streamReservation, true);
} catch (IOException e) {
@@ -337,8 +337,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
// connectionReservation will always be smaller than or the same as
// streamReservation
int frameSize = Integer.min(getMaxFrameSize(),
sendfile.connectionReservation);
- boolean finished = (frameSize == sendfile.left) &&
- sendfile.stream.getCoyoteResponse().getTrailerFields() ==
null;
+ boolean finished =
+ (frameSize == sendfile.left) &&
sendfile.stream.getCoyoteResponse().getTrailerFields() == null;
// Need to check this now since sending end of stream will change
this.
boolean writable = sendfile.stream.canWrite();
@@ -371,7 +371,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
}
}
- protected class SendfileCompletionHandler implements
CompletionHandler<Long, SendfileData> {
+ protected class SendfileCompletionHandler implements
CompletionHandler<Long,SendfileData> {
@Override
public void completed(Long nBytes, SendfileData sendfile) {
CompletionState completionState = null;
@@ -397,12 +397,12 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
try {
if (sendfile.connectionReservation == 0) {
if (sendfile.streamReservation == 0) {
- int reservation = (sendfile.end - sendfile.pos >
Integer.MAX_VALUE) ? Integer.MAX_VALUE
- : (int) (sendfile.end - sendfile.pos);
+ int reservation = (sendfile.end - sendfile.pos >
Integer.MAX_VALUE) ? Integer.MAX_VALUE :
+ (int) (sendfile.end - sendfile.pos);
sendfile.streamReservation =
sendfile.stream.reserveWindowSize(reservation, true);
}
- sendfile.connectionReservation =
reserveWindowSize(sendfile.stream, sendfile.streamReservation,
- true);
+ sendfile.connectionReservation =
+ reserveWindowSize(sendfile.stream,
sendfile.streamReservation, true);
}
} catch (IOException e) {
failed(e, sendfile);
@@ -418,8 +418,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
// connectionReservation will always be smaller than or the
same as
// streamReservation
int frameSize = Integer.min(getMaxFrameSize(),
sendfile.connectionReservation);
- boolean finished = (frameSize == sendfile.left) &&
- sendfile.stream.getCoyoteResponse().getTrailerFields()
== null;
+ boolean finished =
+ (frameSize == sendfile.left) &&
sendfile.stream.getCoyoteResponse().getTrailerFields() == null;
// Need to check this now since sending end of stream will
change this.
boolean writable = sendfile.stream.canWrite();
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java
b/java/org/apache/coyote/http2/Http2Protocol.java
index 08b4be2673..484d5d200a 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -128,8 +128,8 @@ public class Http2Protocol implements UpgradeProtocol {
@Override
public InternalHttpUpgradeHandler
getInternalUpgradeHandler(SocketWrapperBase<?> socketWrapper, Adapter adapter,
Request coyoteRequest) {
- return socketWrapper.hasAsyncIO() ? new Http2AsyncUpgradeHandler(this,
adapter, coyoteRequest, socketWrapper)
- : new Http2UpgradeHandler(this, adapter, coyoteRequest,
socketWrapper);
+ return socketWrapper.hasAsyncIO() ? new Http2AsyncUpgradeHandler(this,
adapter, coyoteRequest, socketWrapper) :
+ new Http2UpgradeHandler(this, adapter, coyoteRequest,
socketWrapper);
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 8f9366daec..46f3eee022 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -116,7 +116,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private HpackDecoder hpackDecoder;
private HpackEncoder hpackEncoder;
- private final ConcurrentNavigableMap<Integer, AbstractNonZeroStream>
streams = new ConcurrentSkipListMap<>();
+ private final ConcurrentNavigableMap<Integer,AbstractNonZeroStream>
streams = new ConcurrentSkipListMap<>();
protected final AtomicInteger activeRemoteStreamCount = new
AtomicInteger(0);
// Start at -1 so the 'add 2' logic in closeIdleStreams() works
private volatile int maxActiveRemoteStreamId = -1;
@@ -1529,8 +1529,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void receivedEndOfStream(int streamId) throws ConnectionException {
- AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
- connectionState.get().isNewStreamAllowed());
+ AbstractNonZeroStream abstractNonZeroStream =
+ getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
Stream stream = (Stream) abstractNonZeroStream;
stream.receivedEndOfStream();
@@ -1580,7 +1580,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void closeIdleStreams(int newMaxActiveRemoteStreamId) {
- final ConcurrentNavigableMap<Integer, AbstractNonZeroStream> subMap =
streams.subMap(
+ final ConcurrentNavigableMap<Integer,AbstractNonZeroStream> subMap =
streams.subMap(
Integer.valueOf(maxActiveRemoteStreamId), false,
Integer.valueOf(newMaxActiveRemoteStreamId), false);
for (AbstractNonZeroStream stream : subMap.values()) {
if (stream instanceof Stream) {
@@ -1612,8 +1612,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void headersEnd(int streamId) throws Http2Exception {
- AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
- connectionState.get().isNewStreamAllowed());
+ AbstractNonZeroStream abstractNonZeroStream =
+ getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index dc72e1e9db..ffd8e47a8d 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -118,8 +118,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
// HTTP/2 Push or HTTP/1.1 upgrade
this.coyoteRequest = coyoteRequest;
- this.inputBuffer = new SavedRequestStreamInputBuffer(
- (SavedRequestInputFilter) coyoteRequest.getInputBuffer());
+ this.inputBuffer =
+ new
SavedRequestStreamInputBuffer((SavedRequestInputFilter)
coyoteRequest.getInputBuffer());
// Headers have been read by this point
state.receivedStartOfHeaders();
if (HTTP_UPGRADE_STREAM.equals(identifier)) {
@@ -545,7 +545,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final void writeTrailers() throws IOException {
- Supplier<Map<String, String>> supplier =
coyoteResponse.getTrailerFields();
+ Supplier<Map<String,String>> supplier =
coyoteResponse.getTrailerFields();
if (supplier == null) {
// No supplier was set, end of stream will already have been sent
return;
@@ -556,7 +556,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
MimeHeaders mimeHeaders = coyoteResponse.getMimeHeaders();
mimeHeaders.recycle();
- Map<String, String> headerMap = supplier.get();
+ Map<String,String> headerMap = supplier.get();
if (headerMap == null) {
headerMap = Collections.emptyMap();
}
@@ -564,7 +564,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
// Copy the contents of the Map to the MimeHeaders
// TODO: Is there benefit in refactoring this? Is MimeHeaders too
// heavyweight? Can we reduce the copy/conversions?
- for (Map.Entry<String, String> headerEntry : headerMap.entrySet()) {
+ for (Map.Entry<String,String> headerEntry : headerMap.entrySet()) {
MessageBytes mb = mimeHeaders.addValue(headerEntry.getKey());
mb.setString(headerEntry.getValue());
}
@@ -743,9 +743,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
inputBuffer.swallowUnread();
}
} catch (IOException ioe) {
- ConnectionException ce = new ConnectionException(
- sm.getString("stream.reset.fail", getConnectionId(),
getIdAsString()),
- Http2Error.PROTOCOL_ERROR, ioe);
+ ConnectionException ce =
+ new
ConnectionException(sm.getString("stream.reset.fail", getConnectionId(),
getIdAsString()),
+ Http2Error.PROTOCOL_ERROR, ioe);
handler.closeConnection(ce);
}
} else {
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index affc460a7b..78cb770649 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -94,9 +94,9 @@ class StreamProcessor extends AbstractProcessor {
// fully read. This typically occurs when Tomcat
rejects an upload
// of some form (e.g. PUT or POST). Need to tell
the client not to
// send any more data on this stream (reset).
- StreamException se = new
StreamException(sm.getString("streamProcessor.cancel",
- stream.getConnectionId(),
stream.getIdAsString()), Http2Error.NO_ERROR,
- stream.getIdAsInt());
+ StreamException se =
+ new
StreamException(sm.getString("streamProcessor.cancel", stream.getConnectionId(),
+ stream.getIdAsString()),
Http2Error.NO_ERROR, stream.getIdAsInt());
stream.close(se);
} else if (!getErrorState().isConnectionIoAllowed()) {
ConnectionException ce = new ConnectionException(
@@ -153,15 +153,16 @@ class StreamProcessor extends AbstractProcessor {
private void prepareSendfile() {
- String fileName = (String) stream.getCoyoteRequest()
-
.getAttribute(org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
+ String fileName =
+ (String)
stream.getCoyoteRequest().getAttribute(org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
if (fileName != null) {
sendfileData = new SendfileData();
sendfileData.path = new File(fileName).toPath();
sendfileData.pos = ((Long) stream.getCoyoteRequest()
.getAttribute(org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue();
- sendfileData.end = ((Long) stream.getCoyoteRequest()
-
.getAttribute(org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue();
+ sendfileData.end =
+ ((Long)
stream.getCoyoteRequest().getAttribute(org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR))
+ .longValue();
sendfileData.left = sendfileData.end - sendfileData.pos;
sendfileData.stream = stream;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
