Skip to content

Commit 150c6ca

Browse files
frsyukifrsyuki
committed
merged
2 parents 7c81027 + fa1187c commit 150c6ca

14 files changed

+493
-162
lines changed

‎src/main/java/org/msgpack/MessagePack.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public <T> void register(Class<T> type, Template<? super T> tmpl) {
153153
registry.register(type, tmpl);
154154
}
155155

156-
public <T> Template<? super T> getTemplate(Class<T> type) {
156+
public <T> Template<? super T> lookup(Class<T> type) {
157157
return registry.lookup(type);
158158
}
159159

‎src/main/java/org/msgpack/packer/Packer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void writeMapEnd() throws IOException {
7878

7979

8080
public Packer write(Object o) throws IOException {
81-
Template tmpl = msgpack.getTemplate(o.getClass());
81+
Template tmpl = msgpack.lookup(o.getClass());
8282
tmpl.write(this, o);
8383
return this;
8484
}
@@ -97,7 +97,7 @@ public Packer write(Value v) throws IOException {
9797
}
9898

9999
// public Packer write(Object o) throws IOException {
100-
// msgpack.getTemplate(o.getClass()).write(this, o);
100+
// msgpack.lookup(o.getClass()).write(this, o);
101101
// return this;
102102
// }
103103
//

‎src/main/java/org/msgpack/template/CollectionTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class CollectionTemplate<E> implements Template<Collection<E>> {
2929
private Template<E> elementTemplate;
3030

31-
private CollectionTemplate(Template<E> elementTemplate) {
31+
public CollectionTemplate(Template<E> elementTemplate) {
3232
this.elementTemplate = elementTemplate;
3333
}
3434

‎src/main/java/org/msgpack/template/ListTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class ListTemplate<E> implements Template<List<E>> {
2929
private Template<E> elementTemplate;
3030

31-
private ListTemplate(Template<E> elementTemplate) {
31+
public ListTemplate(Template<E> elementTemplate) {
3232
this.elementTemplate = elementTemplate;
3333
}
3434

‎src/main/java/org/msgpack/template/MapTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class MapTemplate<K,V> implements Template<Map<K,V>> {
2929
private Template<K> keyTemplate;
3030
private Template<V> valueTemplate;
3131

32-
private MapTemplate(Template<K> keyTemplate, Template<V> valueTemplate) {
32+
public MapTemplate(Template<K> keyTemplate, Template<V> valueTemplate) {
3333
this.keyTemplate = keyTemplate;
3434
this.valueTemplate = valueTemplate;
3535
}

‎src/main/java/org/msgpack/unpacker/Unpacker.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,28 +104,28 @@ public Value readValue() throws IOException {
104104

105105

106106
public <T> T read(T to) throws IOException {
107-
Template<? super T> tmpl = msgpack.getTemplate((Class<T>) to.getClass()); // FIXME T -> ? extends T
107+
Template<? super T> tmpl = msgpack.lookup((Class<T>) to.getClass()); // FIXME T -> ? extends T
108108
return (T) tmpl.read(this, to); // FIXME down cast
109109
}
110110

111111
public <T> T read(Class<T> klass) throws IOException {
112-
Template<? super T> tmpl = msgpack.getTemplate(klass); // FIXME T -> ? extends T
112+
Template<? super T> tmpl = msgpack.lookup(klass); // FIXME T -> ? extends T
113113
return (T) tmpl.read(this, null); // FIXME down cast
114114
}
115115

116116
public <T> T readOptional(T to, T defaultValue) throws IOException {
117117
if(trySkipNil()) {
118118
return defaultValue;
119119
}
120-
Template<? super T> tmpl = msgpack.getTemplate((Class<T>) to.getClass()); // FIXME T -> ? extends T
120+
Template<? super T> tmpl = msgpack.lookup((Class<T>) to.getClass()); // FIXME T -> ? extends T
121121
return (T) tmpl.read(this, to); // FIXME down cast
122122
}
123123

124124
public <T> T readOptional(Class<T> klass, T defaultValue) throws IOException {
125125
if(trySkipNil()) {
126126
return defaultValue;
127127
}
128-
Template<? super T> tmpl = (Template<? super T>) msgpack.getTemplate(klass); // FIXME T -> ? extends T
128+
Template<? super T> tmpl = (Template<? super T>) msgpack.lookup(klass); // FIXME T -> ? extends T
129129
return (T) tmpl.read(this, null); // FIXME down cast
130130
}
131131

‎src/test/java/org/msgpack/TestBufferPackBufferUnpack.java‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ public void testBoolean() throws Exception {
2424

2525
@Override
2626
public void testBoolean(boolean v) throws Exception {
27-
BufferPacker packer = new BufferPacker();
27+
MessagePack msgpack = new MessagePack();
28+
BufferPacker packer = new BufferPacker(msgpack);
2829
packer.writeBoolean(v);
2930
byte[] bytes = packer.toByteArray();
30-
BufferUnpacker unpacker = new BufferUnpacker();
31+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
3132
unpacker.wrap(bytes);
3233
boolean ret = unpacker.readBoolean();
3334
assertEquals(v, ret);
@@ -40,10 +41,11 @@ public void testByte() throws Exception {
4041

4142
@Override
4243
public void testByte(byte v) throws Exception {
43-
BufferPacker packer = new BufferPacker();
44+
MessagePack msgpack = new MessagePack();
45+
BufferPacker packer = new BufferPacker(msgpack);
4446
packer.writeByte(v);
4547
byte[] bytes = packer.toByteArray();
46-
BufferUnpacker unpacker = new BufferUnpacker();
48+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
4749
unpacker.wrap(bytes);
4850
byte ret = unpacker.readByte();
4951
assertEquals(v, ret);
@@ -56,10 +58,11 @@ public void testShort() throws Exception {
5658

5759
@Override
5860
public void testShort(short v) throws Exception {
59-
BufferPacker packer = new BufferPacker();
61+
MessagePack msgpack = new MessagePack();
62+
BufferPacker packer = new BufferPacker(msgpack);
6063
packer.writeShort(v);
6164
byte[] bytes = packer.toByteArray();
62-
BufferUnpacker unpacker = new BufferUnpacker();
65+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
6366
unpacker.wrap(bytes);
6467
short ret = unpacker.readShort();
6568
assertEquals(v, ret);
@@ -72,10 +75,11 @@ public void testInteger() throws Exception {
7275

7376
@Override
7477
public void testInteger(int v) throws Exception {
75-
BufferPacker packer = new BufferPacker();
78+
MessagePack msgpack = new MessagePack();
79+
BufferPacker packer = new BufferPacker(msgpack);
7680
packer.writeInt(v);
7781
byte[] bytes = packer.toByteArray();
78-
BufferUnpacker unpacker = new BufferUnpacker();
82+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
7983
unpacker.wrap(bytes);
8084
int ret = unpacker.readInt();
8185
assertEquals(v, ret);
@@ -88,10 +92,11 @@ public void testLong() throws Exception {
8892

8993
@Override
9094
public void testLong(long v) throws Exception {
91-
BufferPacker packer = new BufferPacker();
95+
MessagePack msgpack = new MessagePack();
96+
BufferPacker packer = new BufferPacker(msgpack);
9297
packer.writeLong(v);
9398
byte[] bytes = packer.toByteArray();
94-
BufferUnpacker unpacker = new BufferUnpacker();
99+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
95100
unpacker.wrap(bytes);
96101
long ret = unpacker.readLong();
97102
assertEquals(v, ret);
@@ -104,10 +109,11 @@ public void testFloat() throws Exception {
104109

105110
@Override
106111
public void testFloat(float v) throws Exception {
107-
BufferPacker packer = new BufferPacker();
112+
MessagePack msgpack = new MessagePack();
113+
BufferPacker packer = new BufferPacker(msgpack);
108114
packer.writeFloat(v);
109115
byte[] bytes = packer.toByteArray();
110-
BufferUnpacker unpacker = new BufferUnpacker();
116+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
111117
unpacker.wrap(bytes);
112118
float ret = unpacker.readFloat();
113119
assertEquals(v, ret, 10e-10);
@@ -120,21 +126,23 @@ public void testDouble() throws Exception {
120126

121127
@Override
122128
public void testDouble(double v) throws Exception {
123-
BufferPacker packer = new BufferPacker();
129+
MessagePack msgpack = new MessagePack();
130+
BufferPacker packer = new BufferPacker(msgpack);
124131
packer.writeDouble(v);
125132
byte[] bytes = packer.toByteArray();
126-
BufferUnpacker unpacker = new BufferUnpacker();
133+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
127134
unpacker.wrap(bytes);
128135
double ret = unpacker.readDouble();
129136
assertEquals(v, ret, 10e-10);
130137
}
131138

132139
@Test @Override
133140
public void testNil() throws Exception {
134-
BufferPacker packer = new BufferPacker();
141+
MessagePack msgpack = new MessagePack();
142+
BufferPacker packer = new BufferPacker(msgpack);
135143
packer.writeNil();
136144
byte[] bytes = packer.toByteArray();
137-
BufferUnpacker unpacker = new BufferUnpacker();
145+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
138146
unpacker.wrap(bytes);
139147
unpacker.readNil();
140148
}
@@ -146,10 +154,11 @@ public void testBigInteger() throws Exception {
146154

147155
@Override
148156
public void testBigInteger(BigInteger v) throws Exception {
149-
BufferPacker packer = new BufferPacker();
157+
MessagePack msgpack = new MessagePack();
158+
BufferPacker packer = new BufferPacker(msgpack);
150159
packer.writeBigInteger(v);
151160
byte[] bytes = packer.toByteArray();
152-
BufferUnpacker unpacker = new BufferUnpacker();
161+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
153162
unpacker.wrap(bytes);
154163
BigInteger ret = unpacker.readBigInteger();
155164
assertEquals(v, ret);
@@ -162,10 +171,11 @@ public void testString() throws Exception {
162171

163172
@Override
164173
public void testString(String v) throws Exception {
165-
BufferPacker packer = new BufferPacker();
174+
MessagePack msgpack = new MessagePack();
175+
BufferPacker packer = new BufferPacker(msgpack);
166176
packer.writeString(v);
167177
byte[] bytes = packer.toByteArray();
168-
BufferUnpacker unpacker = new BufferUnpacker();
178+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
169179
unpacker.wrap(bytes);
170180
String ret = unpacker.readString();
171181
assertEquals(v, ret);
@@ -178,10 +188,11 @@ public void testByteArray() throws Exception {
178188

179189
@Override
180190
public void testByteArray(byte[] v) throws Exception {
181-
BufferPacker packer = new BufferPacker();
191+
MessagePack msgpack = new MessagePack();
192+
BufferPacker packer = new BufferPacker(msgpack);
182193
packer.writeByteArray(v);
183194
byte[] bytes = packer.toByteArray();
184-
BufferUnpacker unpacker = new BufferUnpacker();
195+
BufferUnpacker unpacker = new BufferUnpacker(msgpack);
185196
unpacker.wrap(bytes);
186197
byte[] ret = unpacker.readByteArray();
187198
assertArrayEquals(v, ret);

0 commit comments

Comments
 (0)