Stick to Java enum conventions

slandelle · slandelle · commit d1ad88769b8e · 2015-10-26T12:11:15.000+01:00
diff --git a/client/src/main/java/org/asynchttpclient/netty/request/body/BodyChunkedInput.java b/client/src/main/java/org/asynchttpclient/netty/request/body/BodyChunkedInput.java
@@ -56,14 +56,14 @@ public ByteBuf readChunk(ChannelHandlerContext ctx) throws Exception {
         ByteBuffer buffer = ByteBuffer.allocate(chunkSize);
         Body.BodyState state = body.read(buffer);
         switch (state) {
-            case Stop:
+            case STOP:
                 endOfInput = true;
                 buffer.flip();
                 return Unpooled.wrappedBuffer(buffer);
-            case Suspend:
+            case SUSPEND:
                 //this will suspend the stream in ChunkedWriteHandler
                 return null;
-            case Continue:
+            case CONTINUE:
                 buffer.flip();
                 return Unpooled.wrappedBuffer(buffer);
             default:
diff --git a/client/src/main/java/org/asynchttpclient/request/body/Body.java b/client/src/main/java/org/asynchttpclient/request/body/Body.java
@@ -27,17 +27,17 @@ enum BodyState {
         /**
          * There's something to read
          */
-        Continue,
+        CONTINUE,
 
         /**
          * There's nothing to read and input has to suspend
          */
-        Suspend,
+        SUSPEND,
 
         /**
          * There's nothing to read and input has to stop
          */
-        Stop;
+        STOP;
     }
 
     /**
diff --git a/client/src/main/java/org/asynchttpclient/request/body/generator/ByteArrayBodyGenerator.java b/client/src/main/java/org/asynchttpclient/request/body/generator/ByteArrayBodyGenerator.java
@@ -39,7 +39,7 @@ public long getContentLength() {
         public BodyState read(ByteBuffer byteBuffer) throws IOException {
 
             if (eof) {
-                return BodyState.Stop;
+                return BodyState.STOP;
             }
 
             final int remaining = bytes.length - lastPosition;
@@ -50,7 +50,7 @@ public BodyState read(ByteBuffer byteBuffer) throws IOException {
                 byteBuffer.put(bytes, lastPosition, byteBuffer.capacity());
                 lastPosition = lastPosition + byteBuffer.capacity();
             }
-            return BodyState.Continue;
+            return BodyState.CONTINUE;
         }
 
         public void close() throws IOException {
diff --git a/client/src/main/java/org/asynchttpclient/request/body/generator/InputStreamBodyGenerator.java b/client/src/main/java/org/asynchttpclient/request/body/generator/InputStreamBodyGenerator.java
@@ -78,7 +78,7 @@ public BodyState read(ByteBuffer buffer) throws IOException {
                 buffer.put(chunk, 0, read);
                 write = true;
             }
-            return write ? BodyState.Continue : BodyState.Stop;
+            return write ? BodyState.CONTINUE : BodyState.STOP;
         }
 
         public void close() throws IOException {
diff --git a/client/src/main/java/org/asynchttpclient/request/body/generator/SimpleFeedableBodyGenerator.java b/client/src/main/java/org/asynchttpclient/request/body/generator/SimpleFeedableBodyGenerator.java
@@ -57,7 +57,7 @@ public void writeChunkBoundaries() {
 
     public final class PushBody implements Body {
 
-        private BodyState state = BodyState.Continue;
+        private BodyState state = BodyState.CONTINUE;
 
         @Override
         public long getContentLength() {
@@ -67,18 +67,18 @@ public long getContentLength() {
         @Override
         public BodyState read(final ByteBuffer buffer) throws IOException {
             switch (state) {
-                case Continue:
+                case CONTINUE:
                     return readNextPart(buffer);
-                case Stop:
-                    return BodyState.Stop;
+                case STOP:
+                    return BodyState.STOP;
                 default:
                     throw new IllegalStateException("Illegal process state.");
             }
         }
 
         private BodyState readNextPart(ByteBuffer buffer) throws IOException {
-            BodyState res = BodyState.Suspend;
-            while (buffer.hasRemaining() && state != BodyState.Stop) {
+            BodyState res = BodyState.SUSPEND;
+            while (buffer.hasRemaining() && state != BodyState.STOP) {
                 BodyPart nextPart = queue.peek();
                 if (nextPart == null) {
                     // Nothing in the queue. suspend stream if nothing was read. (reads == 0)
@@ -87,7 +87,7 @@ private BodyState readNextPart(ByteBuffer buffer) throws IOException {
                     // skip empty buffers
                     queue.remove();
                 } else {
-                    res = BodyState.Continue;
+                    res = BodyState.CONTINUE;
                     readBodyPart(buffer, nextPart);
                 }
             }
@@ -102,7 +102,7 @@ private void readBodyPart(ByteBuffer buffer, BodyPart part) {
 
             if (!part.buffer.hasRemaining() && !part.endPadding.hasRemaining()) {
                 if (part.isLast) {
-                    state = BodyState.Stop;
+                    state = BodyState.STOP;
                 }
                 queue.remove();
             }
diff --git a/client/src/main/java/org/asynchttpclient/request/body/multipart/MultipartBody.java b/client/src/main/java/org/asynchttpclient/request/body/multipart/MultipartBody.java
@@ -100,7 +100,7 @@ public BodyState read(ByteBuffer buffer) throws IOException {
             int maxLength = buffer.remaining();
 
             if (currentPart == parts.size() && transfertDone) {
-                return BodyState.Stop;
+                return BodyState.STOP;
             }
 
             boolean full = false;
@@ -173,11 +173,11 @@ public BodyState read(ByteBuffer buffer) throws IOException {
                     }
                 }
             }
-            return transfertDone ? BodyState.Stop : BodyState.Continue;
+            return transfertDone ? BodyState.STOP : BodyState.CONTINUE;
 
         } catch (Exception e) {
             LOGGER.error("Read exception", e);
-            return BodyState.Stop;
+            return BodyState.STOP;
         }
     }
 
diff --git a/client/src/test/java/org/asynchttpclient/request/body/generator/FeedableBodyGeneratorTest.java b/client/src/test/java/org/asynchttpclient/request/body/generator/FeedableBodyGeneratorTest.java
@@ -52,7 +52,7 @@ public void readingBytesReturnsFedContentWithEmptyLastBufferWhenChunkBoundariesE
         assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
         feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
         assertEquals(readFromBody(body), "0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
-        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.Stop);
+        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.STOP);
     }
 
     @Test(groups = "standalone")
@@ -63,7 +63,7 @@ public void readingBytesReturnsFedContentWithEmptyLastBufferWhenChunkBoundariesE
         feedableBodyGenerator.feed(ByteBuffer.allocate(0), true);
         Body body = feedableBodyGenerator.createBody();
         assertEquals(readFromBody(body), "7\r\nTest123\r\n0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
-        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.Stop);
+        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.STOP);
     }
 
     @Test(groups = "standalone")
@@ -73,7 +73,7 @@ public void readingBytesReturnsFedContentWithFilledLastBufferWhenChunkBoundaries
         feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
         Body body = feedableBodyGenerator.createBody();
         assertEquals(readFromBody(body), "7\r\nTest123\r\n0\r\n\r\n".getBytes(StandardCharsets.US_ASCII));
-        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.Stop);
+        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.STOP);
 
     }
 
@@ -83,7 +83,7 @@ public void readingBytesReturnsFedContentWithoutChunkBoundariesWhenNotEnabled()
         feedableBodyGenerator.feed(ByteBuffer.wrap(content), true);
         Body body = feedableBodyGenerator.createBody();
         assertEquals(readFromBody(body), "Test123".getBytes(StandardCharsets.US_ASCII));
-        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.Stop);
+        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.STOP);
     }
 
 
@@ -95,7 +95,7 @@ public void returnZeroToSuspendStreamWhenNothingIsInQueue() throws Exception {
 
         Body body = feedableBodyGenerator.createBody();
         assertEquals(readFromBody(body), "7\r\nTest123\r\n".getBytes(StandardCharsets.US_ASCII));
-        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.Suspend);
+        assertEquals(body.read(ByteBuffer.allocate(1)), BodyState.SUSPEND);
     }
 
     private byte[] readFromBody(Body body) throws IOException {
diff --git a/client/src/test/java/org/asynchttpclient/request/body/generators/ByteArrayBodyGeneratorTest.java b/client/src/test/java/org/asynchttpclient/request/body/generators/ByteArrayBodyGeneratorTest.java
@@ -49,7 +49,7 @@ public void testSingleRead() throws IOException {
         assertEquals(chunkBuffer.position(), srcArraySize, "bytes read");
         chunkBuffer.clear();
 
-        assertEquals(body.read(chunkBuffer), BodyState.Stop, "body at EOF");
+        assertEquals(body.read(chunkBuffer), BodyState.STOP, "body at EOF");
     }
 
     @Test(groups = "standalone")
@@ -66,7 +66,7 @@ public void testMultipleReads() throws IOException {
 
         int reads = 0;
         int bytesRead = 0;
-        while (body.read(chunkBuffer) != BodyState.Stop) {
+        while (body.read(chunkBuffer) != BodyState.STOP) {
           reads += 1;
           bytesRead += chunkBuffer.position();
           chunkBuffer.clear();
diff --git a/client/src/test/java/org/asynchttpclient/request/body/multipart/MultipartBodyTest.java b/client/src/test/java/org/asynchttpclient/request/body/multipart/MultipartBodyTest.java
@@ -69,7 +69,7 @@ private static void compareContentLength(final List<Part> parts) throws IOExcept
             final ByteBuffer buffer = ByteBuffer.allocate(8192);
             boolean last = false;
             while (!last) {
-                if (multipartBody.read(buffer) == BodyState.Stop) {
+                if (multipartBody.read(buffer) == BodyState.STOP) {
                     last = true;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public long getContentLength() {`
`39`	`39`	`public BodyState read(ByteBuffer byteBuffer) throws IOException {`
`40`	`40`
`41`	`41`	`if (eof) {`
`42`		`- return BodyState.Stop;`
	`42`	`+ return BodyState.STOP;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`final int remaining = bytes.length - lastPosition;`
`@@ -50,7 +50,7 @@ public BodyState read(ByteBuffer byteBuffer) throws IOException {`
`50`	`50`	`byteBuffer.put(bytes, lastPosition, byteBuffer.capacity());`
`51`	`51`	`lastPosition = lastPosition + byteBuffer.capacity();`
`52`	`52`	`}`
`53`		`- return BodyState.Continue;`
	`53`	`+ return BodyState.CONTINUE;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public void close() throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public BodyState read(ByteBuffer buffer) throws IOException {`
`78`	`78`	`buffer.put(chunk, 0, read);`
`79`	`79`	`write = true;`
`80`	`80`	`}`
`81`		`- return write ? BodyState.Continue : BodyState.Stop;`
	`81`	`+ return write ? BodyState.CONTINUE : BodyState.STOP;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public void close() throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public BodyState read(ByteBuffer buffer) throws IOException {`
`100`	`100`	`int maxLength = buffer.remaining();`
`101`	`101`
`102`	`102`	`if (currentPart == parts.size() && transfertDone) {`
`103`		`- return BodyState.Stop;`
	`103`	`+ return BodyState.STOP;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`boolean full = false;`
`@@ -173,11 +173,11 @@ public BodyState read(ByteBuffer buffer) throws IOException {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`
`176`		`- return transfertDone ? BodyState.Stop : BodyState.Continue;`
	`176`	`+ return transfertDone ? BodyState.STOP : BodyState.CONTINUE;`
`177`	`177`
`178`	`178`	`} catch (Exception e) {`
`179`	`179`	`LOGGER.error("Read exception", e);`
`180`		`- return BodyState.Stop;`
	`180`	`+ return BodyState.STOP;`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private static void compareContentLength(final List<Part> parts) throws IOExcept`
`69`	`69`	`final ByteBuffer buffer = ByteBuffer.allocate(8192);`
`70`	`70`	`boolean last = false;`
`71`	`71`	`while (!last) {`
`72`		`- if (multipartBody.read(buffer) == BodyState.Stop) {`
	`72`	`+ if (multipartBody.read(buffer) == BodyState.STOP) {`
`73`	`73`	`last = true;`
`74`	`74`	`}`
`75`	`75`	`}`