HTTP/2 API Javadocs.

This commit is contained in:
Simone Bordet 2015-02-11 17:44:05 +01:00
parent 8ca0a86352
commit 360b72a29e
5 changed files with 258 additions and 6 deletions

View File

@ -500,7 +500,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
* @see #onIdleTimeout()
*/
@Override
public void close(int error, String reason, Callback callback)
public boolean close(int error, String reason, Callback callback)
{
while (true)
{
@ -516,7 +516,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
if (LOG.isDebugEnabled())
LOG.debug("Sending {}", frame);
control(null, callback, frame);
return;
return true;
}
break;
}
@ -524,7 +524,8 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
{
if (LOG.isDebugEnabled())
LOG.debug("Ignoring close {}/{}, already closed", error, reason);
return;
callback.succeeded();
return false;
}
}
}

View File

@ -96,9 +96,9 @@ public class HTTP2Stream extends IdleTimeout implements IStream
@Override
public void reset(ResetFrame frame, Callback callback)
{
notIdle();
if (isReset())
return;
notIdle();
localReset = true;
session.control(this, callback, frame, Frame.EMPTY_ARRAY);
}

View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.http2.api;
import java.util.Collection;
import java.util.Map;
import org.eclipse.jetty.http2.frames.DataFrame;
import org.eclipse.jetty.http2.frames.GoAwayFrame;
import org.eclipse.jetty.http2.frames.HeadersFrame;
import org.eclipse.jetty.http2.frames.PingFrame;
@ -29,39 +30,161 @@ import org.eclipse.jetty.http2.frames.SettingsFrame;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Promise;
/**
* <p>A {@link Session} represents the client-side endpoint of a HTTP/2 connection to a single origin server.</p>
* <p>Once a {@link Session} has been obtained, it can be used to open HTTP/2 streams:</p>
* <pre>
* Session session = ...;
* HeadersFrame frame = ...;
* Promise<Stream> promise = ...
* session.newStream(frame, promise, new Stream.Listener.Adapter()
* {
* public void onHeaders(Stream stream, HeadersFrame frame)
* {
* // Reply received
* }
* });
* </pre>
* <p>A {@link Session} is the active part of the endpoint, and by calling its API applications can generate
* events on the connection; conversely {@link Session.Listener} is the passive part of the endpoint, and
* has callbacks that are invoked when events happen on the connection.</p>
*
* @see Session.Listener
*/
public interface Session
{
/**
* <p>Sends the given HEADERS {@code frame} to create a new {@link Stream}.</p>
*
* @param frame the HEADERS frame containing the HTTP headers
* @param promise the promise that gets notified of the stream creation
* @param listener the listener that gets notified of stream events
*/
public void newStream(HeadersFrame frame, Promise<Stream> promise, Stream.Listener listener);
/**
* <p>Sends the given SETTINGS {@code frame} to configure the session.</p>
*
* @param frame the SETTINGS frame to send
* @param callback the callback that gets notified when the frame has been sent
*/
public void settings(SettingsFrame frame, Callback callback);
/**
* <p>Sends the given PING {@code frame}.</p>
* <p>PING frames may be used to test the connection integrity and to measure
* round-trip time.</p>
*
* @param frame the PING frame to send
* @param callback the callback that gets notified when the frame has been sent
*/
public void ping(PingFrame frame, Callback callback);
public void close(int error, String payload, Callback callback);
/**
* <p>Closes the session by sending a GOAWAY frame with the given error code
* and payload.</p>
* <p>The GOAWAY frame is sent only once; subsequent or concurrent attempts to
* close the session will have no effect.</p>
*
* @param error the error code
* @param payload an optional payload (may be null)
* @param callback the callback that gets notified when the frame has been sent
* @return true if the frame is being sent, false if the session was already closed
*/
public boolean close(int error, String payload, Callback callback);
/**
* @return whether the session is not open
*/
public boolean isClosed();
/**
* @return a snapshot of all the streams currently belonging to this session
*/
public Collection<Stream> getStreams();
/**
* <p>Retrieves the stream with the given {@code streamId}.</p>
*
* @param streamId the stream id of the stream looked for
* @return the stream with the given id, or null if no such stream exist
*/
public Stream getStream(int streamId);
/**
* <p>A {@link Listener} is the passive counterpart of a {@link Session} and
* receives events happening on a HTTP/2 connection.</p>
*
* @see Session
*/
public interface Listener
{
public Map<Integer,Integer> onPreface(Session session);
/**
* <p>Callback method invoked when the preface has been received.</p>
*
* @param session the session
* @return a (possibly empty or null) map containing SETTINGS configuration
* options that are sent after the preface.
*/
public Map<Integer, Integer> onPreface(Session session);
/**
* <p>Callback method invoked when a new stream is being created upon
* receiving a HEADERS frame representing a HTTP request.</p>
* <p>Applications should implement this method to process HTTP requests,
* typically providing a HTTP response via
* {@link Stream#headers(HeadersFrame, Callback)}.</p>
* <p>Applications can detect whether request DATA frames will be arriving
* by testing {@link HeadersFrame#isEndStream()}. If the application is
* interested in processing the DATA frames, it must return a
* {@link Stream.Listener} implementation that overrides
* {@link Stream.Listener#onData(Stream, DataFrame, Callback)}.</p>
*
* @param stream the newly created stream
* @param frame the HEADERS frame received
* @return a {@link Stream.Listener} that will be notified of stream events
*/
public Stream.Listener onNewStream(Stream stream, HeadersFrame frame);
/**
* <p>Callback method invoked when a SETTINGS frame has been received.</p>
*
* @param session the session
* @param frame the SETTINGS frame received
*/
public void onSettings(Session session, SettingsFrame frame);
/**
* <p>Callback method invoked when a PING frame has been received.</p>
*
* @param session the session
* @param frame the PING frame received
*/
public void onPing(Session session, PingFrame frame);
/**
* <p>Callback method invoked when a RST_STREAM frame has been received for an unknown stream.</p>
*
* @param session the session
* @param frame the RST_STREAM frame received
* @see {@link Stream.Listener#onReset(Stream, ResetFrame)}
*/
public void onReset(Session session, ResetFrame frame);
/**
* <p>Callback method invoked when a GOAWAY frame has been received.</p>
*
* @param session the session
* @param frame the GOAWAY frame received
*/
public void onClose(Session session, GoAwayFrame frame);
// TODO: how come this is not called ???
public void onFailure(Session session, Throwable failure);
/**
* <p>Empty implementation of {@link Stream.Listener}.</p>
*/
public static class Adapter implements Session.Listener
{
@Override

View File

@ -25,46 +25,164 @@ import org.eclipse.jetty.http2.frames.ResetFrame;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Promise;
/**
* <p>A {@link Stream} represents a bidirectional exchange of data on top of a {@link Session}.</p>
* <p>Differently from socket streams, where the input and output streams are permanently associated
* with the socket (and hence with the connection that the socket represents), there can be multiple
* HTTP/2 streams present concurrent for a HTTP/2 session.</p>
* <p>A {@link Stream} maps to a HTTP request/response cycle, and after the request/response cycle is
* completed, the stream is closed and removed from the session.</p>
* <p>Like {@link Session}, {@link Stream} is the active part and by calling its API applications
* can generate events on the stream; conversely, {@link Stream.Listener} is the passive part, and
* its callbacks are invoked when events happen on the stream.</p>
*
* @see Stream.Listener
*/
public interface Stream
{
/**
* @return the stream unique id
*/
public int getId();
/**
* @return the session this stream is associated to
*/
public Session getSession();
/**
* <p>Sends the given HEADERS {@code frame} representing a HTTP response.</p>
*
* @param frame the HEADERS frame to send
* @param callback the callback that gets notified when the frame has been sent
*/
public void headers(HeadersFrame frame, Callback callback);
/**
* <p>Sends the given PUSH_PROMISE {@code frame}.</p>
*
* @param frame the PUSH_PROMISE frame to send
* @param promise the promise that gets notified of the pushed stream creation
*/
public void push(PushPromiseFrame frame, Promise<Stream> promise);
/**
* <p>Sends the given DATA {@code frame}.</p>
*
* @param frame the DATA frame to send
* @param callback the callback that gets notified when the frame has been sent
*/
public void data(DataFrame frame, Callback callback);
/**
* <p>Sends the given RST_STREAM {@code frame}.</p>
*
* @param frame the RST_FRAME to send
* @param callback the callback that gets notified when the frame has been sent
*/
public void reset(ResetFrame frame, Callback callback);
/**
* @param key the attribute key
* @return an arbitrary object associated with the given key to this stream
* or null if no object can be found for the given key.
* @see #setAttribute(String, Object)
*/
public Object getAttribute(String key);
/**
* @param key the attribute key
* @param value an arbitrary object to associate with the given key to this stream
* @see #getAttribute(String)
* @see #removeAttribute(String)
*/
public void setAttribute(String key, Object value);
/**
* @param key the attribute key
* @return the arbitrary object associated with the given key to this stream
* @see #setAttribute(String, Object)
*/
public Object removeAttribute(String key);
/**
* @return whether this stream has been reset
*/
public boolean isReset();
/**
* @return whether this stream is closed, both locally and remotely.
*/
public boolean isClosed();
/**
* @return the stream idle timeout
* @see #setIdleTimeout(long)
*/
public long getIdleTimeout();
/**
* @param idleTimeout the stream idle timeout
* @see #getIdleTimeout()
* @see Stream.Listener#onTimeout(Stream, Throwable)
*/
public void setIdleTimeout(long idleTimeout);
/**
* <p>A {@link Stream.Listener} is the passive counterpart of a {@link Stream} and receives
* events happening on a HTTP/2 stream.</p>
*
* @see Stream
*/
public interface Listener
{
/**
* <p>Callback method invoked when a HEADERS frame representing the HTTP response has been received.</p>
*
* @param stream the stream
* @param frame the HEADERS frame received
*/
public void onHeaders(Stream stream, HeadersFrame frame);
/**
* <p>Callback method invoked when a PUSH_PROMISE frame has been received.</p>
*
* @param stream the stream
* @param frame the PUSH_PROMISE frame received
* @return a {@link Stream.Listener} that will be notified of pushed stream events
*/
public Listener onPush(Stream stream, PushPromiseFrame frame);
/**
* <p>Callback method invoked when a DATA frame has been received.</p>
*
* @param stream the stream
* @param frame the DATA frame received
* @param callback the callback to complete when the bytes of the DATA frame have been consumed
*/
public void onData(Stream stream, DataFrame frame, Callback callback);
/**
* <p>Callback method invoked when a RST_STREAM frame has been received for this stream.</p>
*
* @param stream the stream
* @param frame the RST_FRAME received
* @see Session.Listener#onReset(Session, ResetFrame)
*/
public void onReset(Stream stream, ResetFrame frame);
/**
* <p>Callback method invoked when the stream exceeds its idle timeout.</p>
*
* @param stream the stream
* @param x the timeout failure
* @see #getIdleTimeout()
*/
public void onTimeout(Stream stream, Throwable x);
/**
* <p>Empty implementation of {@link Listener}</p>
*/
public static class Adapter implements Listener
{
@Override

View File

@ -20,10 +20,20 @@ package org.eclipse.jetty.http2.api.server;
import org.eclipse.jetty.http2.api.Session;
/**
* <p>Server-side extension of {@link Session.Listener} that exposes additional events.</p>
*/
public interface ServerSessionListener extends Session.Listener
{
/**
* <p>Callback method invoked when a connection has been accepted by the server.</p>
* @param session the session
*/
public void onAccept(Session session);
/**
* <p>Empty implementation of {@link ServerSessionListener}</p>
*/
public static class Adapter extends Session.Listener.Adapter implements ServerSessionListener
{
@Override