Issue #922 - Implements methods Connection.getBytes[In|Out]().

Using int rather than long as return value for generated bytes.
jetty · Sep 14, 2016 · 464dd06 · 464dd06
1 parent aa00e42
commit 464dd06
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
@@ -1108,7 +1108,7 @@ public String toString()
 
     private class ControlEntry extends HTTP2Flusher.Entry
     {
-        private long bytes;
+        private int bytes;
 
         private ControlEntry(Frame frame, IStream stream, Callback callback)
         {
@@ -1224,7 +1224,7 @@ public void succeeded()
     private class DataEntry extends HTTP2Flusher.Entry
     {
         private int length;
-        private long bytes;
+        private int bytes;
 
         private DataEntry(DataFrame frame, IStream stream, Callback callback)
         {

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/DataGenerator.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/DataGenerator.java
@@ -36,12 +36,12 @@ public DataGenerator(HeaderGenerator headerGenerator)
         this.headerGenerator = headerGenerator;
     }
 
-    public long generate(ByteBufferPool.Lease lease, DataFrame frame, int maxLength)
+    public int generate(ByteBufferPool.Lease lease, DataFrame frame, int maxLength)
     {
         return generateData(lease, frame.getStreamId(), frame.getData(), frame.isEndStream(), maxLength);
     }
 
-    public long generateData(ByteBufferPool.Lease lease, int streamId, ByteBuffer data, boolean last, int maxLength)
+    public int generateData(ByteBufferPool.Lease lease, int streamId, ByteBuffer data, boolean last, int maxLength)
     {
         if (streamId < 0)
             throw new IllegalArgumentException("Invalid stream id: " + streamId);
@@ -61,7 +61,7 @@ public long generateData(ByteBufferPool.Lease lease, int streamId, ByteBuffer da
         if (frames * maxFrameSize != length)
             ++frames;
 
-        long totalLength = 0;
+        int totalLength = 0;
         int begin = data.position();
         int end = data.limit();
         for (int i = 1; i <= frames; ++i)
@@ -77,7 +77,7 @@ public long generateData(ByteBufferPool.Lease lease, int streamId, ByteBuffer da
         return totalLength;
     }
 
-    private long generateFrame(ByteBufferPool.Lease lease, int streamId, ByteBuffer data, boolean last)
+    private int generateFrame(ByteBufferPool.Lease lease, int streamId, ByteBuffer data, boolean last)
     {
         int length = data.remaining();
 

diff --git a/...tp2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/DisconnectGenerator.java b/...tp2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/DisconnectGenerator.java
@@ -29,7 +29,7 @@ public DisconnectGenerator()
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         return 0;
     }

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/FrameGenerator.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/FrameGenerator.java
@@ -33,7 +33,7 @@ protected FrameGenerator(HeaderGenerator headerGenerator)
         this.headerGenerator = headerGenerator;
     }
 
-    public abstract long generate(ByteBufferPool.Lease lease, Frame frame);
+    public abstract int generate(ByteBufferPool.Lease lease, Frame frame);
 
     protected ByteBuffer generateHeader(ByteBufferPool.Lease lease, FrameType frameType, int length, int flags, int streamId)
     {

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/Generator.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/Generator.java
@@ -75,12 +75,12 @@ public void setMaxFrameSize(int maxFrameSize)
         headerGenerator.setMaxFrameSize(maxFrameSize);
     }
 
-    public long control(ByteBufferPool.Lease lease, Frame frame)
+    public int control(ByteBufferPool.Lease lease, Frame frame)
     {
         return generators[frame.getType().getType()].generate(lease, frame);
     }
 
-    public long data(ByteBufferPool.Lease lease, DataFrame frame, int maxLength)
+    public int data(ByteBufferPool.Lease lease, DataFrame frame, int maxLength)
     {
         return dataGenerator.generate(lease, frame, maxLength);
     }

diff --git a/...y-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/GoAwayGenerator.java b/...y-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/GoAwayGenerator.java
@@ -36,13 +36,13 @@ public GoAwayGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         GoAwayFrame goAwayFrame = (GoAwayFrame)frame;
         return generateGoAway(lease, goAwayFrame.getLastStreamId(), goAwayFrame.getError(), goAwayFrame.getPayload());
     }
 
-    public long generateGoAway(ByteBufferPool.Lease lease, int lastStreamId, int error, byte[] payload)
+    public int generateGoAway(ByteBufferPool.Lease lease, int lastStreamId, int error, byte[] payload)
     {
         if (lastStreamId < 0)
             throw new IllegalArgumentException("Invalid last stream id: " + lastStreamId);

diff --git a/...-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/HeadersGenerator.java b/...-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/HeadersGenerator.java
@@ -50,13 +50,13 @@ public HeadersGenerator(HeaderGenerator headerGenerator, HpackEncoder encoder, i
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         HeadersFrame headersFrame = (HeadersFrame)frame;
         return generateHeaders(lease, headersFrame.getStreamId(), headersFrame.getMetaData(), headersFrame.getPriority(), headersFrame.isEndStream());
     }
 
-    public long generateHeaders(ByteBufferPool.Lease lease, int streamId, MetaData metaData, PriorityFrame priority, boolean endStream)
+    public int generateHeaders(ByteBufferPool.Lease lease, int streamId, MetaData metaData, PriorityFrame priority, boolean endStream)
     {
         if (streamId < 0)
             throw new IllegalArgumentException("Invalid stream id: " + streamId);

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PingGenerator.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PingGenerator.java
@@ -35,13 +35,13 @@ public PingGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         PingFrame pingFrame = (PingFrame)frame;
         return generatePing(lease, pingFrame.getPayload(), pingFrame.isReply());
     }
 
-    public long generatePing(ByteBufferPool.Lease lease, byte[] payload, boolean reply)
+    public int generatePing(ByteBufferPool.Lease lease, byte[] payload, boolean reply)
     {
         if (payload.length != PingFrame.PING_LENGTH)
             throw new IllegalArgumentException("Invalid payload length: " + payload.length);

diff --git a/...-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PrefaceGenerator.java b/...-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PrefaceGenerator.java
@@ -32,7 +32,7 @@ public PrefaceGenerator()
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         lease.append(ByteBuffer.wrap(PrefaceFrame.PREFACE_BYTES), false);
         return PrefaceFrame.PREFACE_BYTES.length;

diff --git a/...http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PriorityGenerator.java b/...http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PriorityGenerator.java
@@ -35,13 +35,13 @@ public PriorityGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         PriorityFrame priorityFrame = (PriorityFrame)frame;
         return generatePriority(lease, priorityFrame.getStreamId(), priorityFrame.getParentStreamId(), priorityFrame.getWeight(), priorityFrame.isExclusive());
     }
 
-    public long generatePriority(ByteBufferPool.Lease lease, int streamId, int parentStreamId, int weight, boolean exclusive)
+    public int generatePriority(ByteBufferPool.Lease lease, int streamId, int parentStreamId, int weight, boolean exclusive)
     {
         ByteBuffer header = generateHeader(lease, FrameType.PRIORITY, PriorityFrame.PRIORITY_LENGTH, Flags.NONE, streamId);
         generatePriorityBody(header, streamId, parentStreamId, weight, exclusive);

diff --git a/...p2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PushPromiseGenerator.java b/...p2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PushPromiseGenerator.java
@@ -40,13 +40,13 @@ public PushPromiseGenerator(HeaderGenerator headerGenerator, HpackEncoder encode
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         PushPromiseFrame pushPromiseFrame = (PushPromiseFrame)frame;
         return generatePushPromise(lease, pushPromiseFrame.getStreamId(), pushPromiseFrame.getPromisedStreamId(), pushPromiseFrame.getMetaData());
     }
 
-    public long generatePushPromise(ByteBufferPool.Lease lease, int streamId, int promisedStreamId, MetaData metaData)
+    public int generatePushPromise(ByteBufferPool.Lease lease, int streamId, int promisedStreamId, MetaData metaData)
     {
         if (streamId < 0)
             throw new IllegalArgumentException("Invalid stream id: " + streamId);

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/ResetGenerator.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/ResetGenerator.java
@@ -35,13 +35,13 @@ public ResetGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         ResetFrame resetFrame = (ResetFrame)frame;
         return generateReset(lease, resetFrame.getStreamId(), resetFrame.getError());
     }
 
-    public long generateReset(ByteBufferPool.Lease lease, int streamId, int error)
+    public int generateReset(ByteBufferPool.Lease lease, int streamId, int error)
     {
         if (streamId < 0)
             throw new IllegalArgumentException("Invalid stream id: " + streamId);

diff --git a/...http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/SettingsGenerator.java b/...http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/SettingsGenerator.java
@@ -36,13 +36,13 @@ public SettingsGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         SettingsFrame settingsFrame = (SettingsFrame)frame;
         return generateSettings(lease, settingsFrame.getSettings(), settingsFrame.isReply());
     }
 
-    public long generateSettings(ByteBufferPool.Lease lease, Map<Integer, Integer> settings, boolean reply)
+    public int generateSettings(ByteBufferPool.Lease lease, Map<Integer, Integer> settings, boolean reply)
     {
         // Two bytes for the identifier, four bytes for the value.
         int entryLength = 2 + 4;

diff --git a/...2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/WindowUpdateGenerator.java b/...2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/WindowUpdateGenerator.java
@@ -35,13 +35,13 @@ public WindowUpdateGenerator(HeaderGenerator headerGenerator)
     }
 
     @Override
-    public long generate(ByteBufferPool.Lease lease, Frame frame)
+    public int generate(ByteBufferPool.Lease lease, Frame frame)
     {
         WindowUpdateFrame windowUpdateFrame = (WindowUpdateFrame)frame;
         return generateWindowUpdate(lease, windowUpdateFrame.getStreamId(), windowUpdateFrame.getWindowDelta());
     }
 
-    public long generateWindowUpdate(ByteBufferPool.Lease lease, int streamId, int windowUpdate)
+    public int generateWindowUpdate(ByteBufferPool.Lease lease, int streamId, int windowUpdate)
     {
         if (windowUpdate < 0)
             throw new IllegalArgumentException("Invalid window update: " + windowUpdate);