serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic refactor: add final keyword where possible

Browse source
This commit is contained in:
Adam Rosenberger 2014-05-19 08:43:58 -04:00
parent dd286c6e17
commit d5e0a8c02d
17 changed files with 58 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
runtime/src/main/java/org/capnproto/AnyPointer.java
View file

@ -1,9 +1,9 @@
package org.capnproto;
public class AnyPointer {
public final class AnyPointer {
public static class Reader {
public PointerReader reader;
public final static class Reader {
public final PointerReader reader;
public Reader(PointerReader reader) {
this.reader = reader;

2
runtime/src/main/java/org/capnproto/DecodeException.java
View file

@ -1,6 +1,6 @@
package org.capnproto;
public class DecodeException extends RuntimeException {
public final class DecodeException extends RuntimeException {
public DecodeException(String message) {
super(message);
}

2
runtime/src/main/java/org/capnproto/FieldSize.java
View file

@ -1,6 +1,6 @@
package org.capnproto;
public class FieldSize {
public final class FieldSize {
public static final byte VOID = 0;
public static final byte BIT = 1;
public static final byte BYTE = 2;

4
runtime/src/main/java/org/capnproto/FromStructBuilder.java
View file

@ -1,6 +1,6 @@
package org.capnproto;
public interface FromStructBuilder<T> {
public abstract T fromStructBuilder(StructBuilder builder);
public abstract StructSize structSize();
T fromStructBuilder(StructBuilder builder);
StructSize structSize();
}

2
runtime/src/main/java/org/capnproto/FromStructReader.java
View file

@ -1,5 +1,5 @@
package org.capnproto;
public interface FromStructReader<T> {
public abstract T fromStructReader(StructReader reader);
T fromStructReader(StructReader reader);
}

7
runtime/src/main/java/org/capnproto/InputStreamMessageReader.java
View file

@ -1,13 +1,12 @@
package org.capnproto;
import java.io.InputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Vector;
public class InputStreamMessageReader {
public final class InputStreamMessageReader {
static byte[] readExact(InputStream is, int length) throws IOException {
byte[] bytes = new byte[length];
@ -52,7 +51,7 @@ public class InputStreamMessageReader {
if (segmentCount > 1) {
ByteBuffer moreSizesRaw = makeByteBuffer(readExact(is, 4 * (segmentCount & ~1)));
for(int ii = 0; ii < segmentCount - 1; ++ii) {
for (int ii = 0; ii < segmentCount - 1; ++ii) {
int size = moreSizesRaw.getInt(ii * 4);
moreSizes.add(size);
totalWords += size;

12
runtime/src/main/java/org/capnproto/ListBuilder.java
View file

@ -1,12 +1,12 @@
package org.capnproto;
public final class ListBuilder {
SegmentBuilder segment;
int ptr; // byte offset to front of list
int elementCount;
int step; // in bits
int structDataSize; // in bits
short structPointerCount;
final SegmentBuilder segment;
final int ptr; // byte offset to front of list
final int elementCount;
final int step; // in bits
final int structDataSize; // in bits
final short structPointerCount;
public ListBuilder(SegmentBuilder segment, int ptr,
int elementCount, int step,

21
runtime/src/main/java/org/capnproto/ListReader.java
View file

@ -1,16 +1,15 @@
package org.capnproto;
public class ListReader {
SegmentReader segment;
int ptr; // byte offset to front of list
int elementCount;
int step; // in bits
int structDataSize; // in bits
short structPointerCount;
int nestingLimit;
public final class ListReader {
final SegmentReader segment;
final int ptr; // byte offset to front of list
final int elementCount;
final int step; // in bits
final int structDataSize; // in bits
final short structPointerCount;
final int nestingLimit;
public ListReader () {
public ListReader() {
this.segment = null;
this.ptr = 0;
this.elementCount = 0;
@ -47,6 +46,6 @@ public class ListReader {
int structPointers = structData + (this.structDataSize / 8);
return new StructReader(this.segment, structData, structPointers / 8, this.structDataSize,
this.structPointerCount, (byte)(indexBit % 8), this.nestingLimit - 1);
this.structPointerCount, (byte) (indexBit % 8), this.nestingLimit - 1);
}
}

4
runtime/src/main/java/org/capnproto/MessageReader.java
View file

@ -2,8 +2,8 @@ package org.capnproto;
import java.nio.ByteBuffer;
public class MessageReader {
ByteBuffer[] segmentSlices;
public final class MessageReader {
final ByteBuffer[] segmentSlices;
public MessageReader(ByteBuffer[] segmentSlices) {
this.segmentSlices = segmentSlices;

4
runtime/src/main/java/org/capnproto/PointerBuilder.java
View file

@ -1,8 +1,8 @@
package org.capnproto;
public final class PointerBuilder {
public SegmentBuilder segment;
public int pointer; // word offset
public final SegmentBuilder segment;
public final int pointer; // word offset
public PointerBuilder(SegmentBuilder segment, int pointer) {
this.segment = segment;

8
runtime/src/main/java/org/capnproto/PointerReader.java
View file

@ -1,9 +1,9 @@
package org.capnproto;
public class PointerReader {
public SegmentReader segment;
public int pointer; // word offset
public int nestingLimit;
public final class PointerReader {
public final SegmentReader segment;
public final int pointer; // word offset
public final int nestingLimit;
public PointerReader() {
this.segment = null;

6
runtime/src/main/java/org/capnproto/SegmentBuilder.java
View file

@ -2,11 +2,11 @@ package org.capnproto;
import java.nio.ByteBuffer;
public class SegmentBuilder extends SegmentReader {
public int pos = 0; // in words
public final class SegmentBuilder extends SegmentReader {
public static final int FAILED_ALLOCATION = -1;
public int pos = 0; // in words
public SegmentBuilder(ByteBuffer buf) {
super(buf);
}

2
runtime/src/main/java/org/capnproto/SegmentReader.java
View file

@ -3,7 +3,7 @@ package org.capnproto;
import java.nio.ByteBuffer;
public class SegmentReader {
ByteBuffer buffer;
final ByteBuffer buffer;
public SegmentReader(ByteBuffer buffer) {
this.buffer = buffer;

12
runtime/src/main/java/org/capnproto/StructBuilder.java
View file

@ -1,12 +1,12 @@
package org.capnproto;
public final class StructBuilder {
public SegmentBuilder segment;
public int data; //byte offset to data section
public int pointers; // word offset of pointer section
public int dataSize; // in bits
public short pointerCount;
public byte bit0Offset;
public final SegmentBuilder segment;
public final int data; //byte offset to data section
public final int pointers; // word offset of pointer section
public final int dataSize; // in bits
public final short pointerCount;
public final byte bit0Offset;
public StructBuilder(SegmentBuilder segment, int data,
int pointers, int dataSize, short pointerCount,

1
runtime/src/main/java/org/capnproto/StructList.java
View file

@ -1,6 +1,5 @@
package org.capnproto;
public final class StructList {
public static final class Reader<T> {
public ListReader reader;

15
runtime/src/main/java/org/capnproto/StructReader.java
View file

@ -1,14 +1,13 @@
package org.capnproto;
public final class StructReader {
public SegmentReader segment;
public int data; //byte offset to data section
public int pointers; // word offset of pointer section
public int dataSize; // in bits
public short pointerCount;
public byte bit0Offset;
public int nestingLimit;
public final SegmentReader segment;
public final int data; //byte offset to data section
public final int pointers; // word offset of pointer section
public final int dataSize; // in bits
public final short pointerCount;
public final byte bit0Offset;
public final int nestingLimit;
public StructReader(SegmentReader segment, int data,
int pointers, int dataSize, short pointerCount,

4
runtime/src/main/java/org/capnproto/Text.java
View file

@ -2,7 +2,7 @@ package org.capnproto;
import java.nio.ByteBuffer;
public class Text {
public final class Text {
public static final class Reader {
public final ByteBuffer buffer;
@ -35,7 +35,7 @@ public class Text {
try {
return new String(bytes, "UTF-8");
} catch(java.io.UnsupportedEncodingException e) {
} catch (java.io.UnsupportedEncodingException e) {
return "unsupported encoding"; // XXX
}
}