4ce994dd4f
Motivation:
The commit 50e06442c3 changed the type of
the constants in HttpHeaders.Names and HttpHeaders.Values, making 4.1
backward-incompatible with 4.0.
It also introduces newer utility classes such as HttpHeaderUtil, which
deprecates most static methods in HttpHeaders. To ease the migration
between 4.1 and 5.0, we should deprecate all static methods that are
non-existent in 5.0, and provide proper counterpart.
Modification:
- Revert the changes in HttpHeaders.Names and Values
- Deprecate all static methods in HttpHeaders in favor of:
- HttpHeaderUtil
- the member methods of HttpHeaders
- AsciiString
- Add integer and date access methods to HttpHeaders for easier future
migration to 5.0
- Add HttpHeaderNames and HttpHeaderValues which provide standard HTTP
constants in AsciiString
- Deprecate HttpHeaders.Names and Values
- Make HttpHeaderValues.WEBSOCKET lowercased because it's actually
lowercased in all WebSocket versions but the oldest one
- Add RtspHeaderNames and RtspHeaderValues which provide standard RTSP
constants in AsciiString
- Deprecate RtspHeaders.*
- Do not use AsciiString.equalsIgnoreCase(CharSeq, CharSeq) if one of
the parameters are AsciiString
- Avoid using AsciiString.toString() repetitively
- Change the parameter type of some methods from String to
CharSequence
Result:
Backward compatibility is recovered. New classes and methods will make
the migration to 5.0 easier, once (Http|Rtsp)Header(Names|Values) are
ported to master.
69 lines
2.6 KiB
Java
69 lines
2.6 KiB
Java
/*
|
|
* Copyright 2012 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.handler.codec.spdy;
|
|
|
|
import io.netty.channel.ChannelHandlerContext;
|
|
import io.netty.handler.codec.MessageToMessageCodec;
|
|
import io.netty.handler.codec.http.HttpMessage;
|
|
import io.netty.handler.codec.spdy.SpdyHttpHeaders.Names;
|
|
import io.netty.util.ReferenceCountUtil;
|
|
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
import java.util.Queue;
|
|
|
|
/**
|
|
* {@link MessageToMessageCodec} that takes care of adding the right {@link SpdyHttpHeaders.Names#STREAM_ID} to the
|
|
* {@link HttpMessage} if one is not present. This makes it possible to just re-use plan handlers current used
|
|
* for HTTP.
|
|
*/
|
|
public class SpdyHttpResponseStreamIdHandler extends
|
|
MessageToMessageCodec<Object, HttpMessage> {
|
|
private static final Integer NO_ID = -1;
|
|
private final Queue<Integer> ids = new LinkedList<Integer>();
|
|
|
|
@Override
|
|
public boolean acceptInboundMessage(Object msg) throws Exception {
|
|
return msg instanceof HttpMessage || msg instanceof SpdyRstStreamFrame;
|
|
}
|
|
|
|
@Override
|
|
protected void encode(ChannelHandlerContext ctx, HttpMessage msg, List<Object> out) throws Exception {
|
|
Integer id = ids.poll();
|
|
if (id != null && id.intValue() != NO_ID && !msg.headers().contains(SpdyHttpHeaders.Names.STREAM_ID)) {
|
|
msg.headers().setInt(Names.STREAM_ID, id);
|
|
}
|
|
|
|
out.add(ReferenceCountUtil.retain(msg));
|
|
}
|
|
|
|
@Override
|
|
protected void decode(ChannelHandlerContext ctx, Object msg, List<Object> out) throws Exception {
|
|
if (msg instanceof HttpMessage) {
|
|
boolean contains = ((HttpMessage) msg).headers().contains(SpdyHttpHeaders.Names.STREAM_ID);
|
|
if (!contains) {
|
|
ids.add(NO_ID);
|
|
} else {
|
|
ids.add(((HttpMessage) msg).headers().getInt(Names.STREAM_ID));
|
|
}
|
|
} else if (msg instanceof SpdyRstStreamFrame) {
|
|
ids.remove(((SpdyRstStreamFrame) msg).streamId());
|
|
}
|
|
|
|
out.add(ReferenceCountUtil.retain(msg));
|
|
}
|
|
}
|