Skip to content

Commit bc7e503

Browse files
xerialxerial
committed
ValueFactory.newXXXValue -> newXXX for brevity
1 parent e2fc4e6 commit bc7e503

File tree

6 files changed

+94
-64
lines changed

6 files changed

+94
-64
lines changed

‎msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,33 +540,33 @@ public ImmutableValue unpackValue() throws IOException {
540540
switch(mf.getValueType()) {
541541
case NIL:
542542
unpackNil();
543-
return ValueFactory.newNilValue();
543+
return ValueFactory.nil();
544544
case BOOLEAN:
545-
return ValueFactory.newBooleanValue(unpackBoolean());
545+
return ValueFactory.newBoolean(unpackBoolean());
546546
case INTEGER:
547547
switch (mf) {
548548
case UINT64:
549-
return ValueFactory.newIntegerValue(unpackBigInteger());
549+
return ValueFactory.newInteger(unpackBigInteger());
550550
default:
551-
return ValueFactory.newIntegerValue(unpackLong());
551+
return ValueFactory.newInteger(unpackLong());
552552
}
553553
case FLOAT:
554-
return ValueFactory.newFloatValue(unpackDouble());
554+
return ValueFactory.newFloat(unpackDouble());
555555
case STRING: {
556556
int length = unpackRawStringHeader();
557-
return ValueFactory.newStringValue(readPayload(length));
557+
return ValueFactory.newString(readPayload(length));
558558
}
559559
case BINARY: {
560560
int length = unpackBinaryHeader();
561-
return ValueFactory.newBinaryValue(readPayload(length));
561+
return ValueFactory.newBinary(readPayload(length));
562562
}
563563
case ARRAY: {
564564
int size = unpackArrayHeader();
565565
Value[] array = new Value[size];
566566
for (int i=0; i < size; i++) {
567567
array[i] = unpackValue();
568568
}
569-
return ValueFactory.newArrayValue(array);
569+
return ValueFactory.newArray(array);
570570
}
571571
case MAP: {
572572
int size = unpackMapHeader();
@@ -577,11 +577,11 @@ public ImmutableValue unpackValue() throws IOException {
577577
kvs[i] = unpackValue();
578578
i++;
579579
}
580-
return ValueFactory.newMapValue(kvs);
580+
return ValueFactory.newMap(kvs);
581581
}
582582
case EXTENSION: {
583583
ExtensionTypeHeader extHeader = unpackExtensionTypeHeader();
584-
return ValueFactory.newExtensionValue(extHeader.getType(), readPayload(extHeader.getLength()));
584+
return ValueFactory.newExtension(extHeader.getType(), readPayload(extHeader.getLength()));
585585
}
586586
default:
587587
throw new MessageFormatException("Unknown value type");

‎msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java‎

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,92 +26,85 @@
2626
import org.msgpack.value.impl.ImmutableMapValueImpl;
2727
import org.msgpack.value.impl.ImmutableExtensionValueImpl;
2828

29-
import java.util.Iterator;
30-
import java.util.List;
31-
import java.util.Map;
32-
import java.util.Arrays;
29+
import java.util.*;
3330
import java.math.BigInteger;
3431

3532
public final class ValueFactory {
3633
private ValueFactory() { }
3734

38-
public static ImmutableNilValue newNilValue() {
35+
public static ImmutableNilValue nil() {
3936
return ImmutableNilValueImpl.get();
4037
}
4138

42-
public static ImmutableBooleanValue newBooleanValue(boolean v) {
43-
if (v) {
44-
return ImmutableBooleanValueImpl.trueInstance();
45-
} else {
46-
return ImmutableBooleanValueImpl.falseInstance();
47-
}
39+
public static ImmutableBooleanValue newBoolean(boolean v) {
40+
return v ? ImmutableBooleanValueImpl.TRUE : ImmutableBooleanValueImpl.FALSE;
4841
}
4942

50-
public static ImmutableIntegerValue newIntegerValue(byte v) {
43+
public static ImmutableIntegerValue newInteger(byte v) {
5144
return new ImmutableLongValueImpl(v);
5245
}
5346

54-
public static ImmutableIntegerValue newIntegerValue(short v) {
47+
public static ImmutableIntegerValue newInteger(short v) {
5548
return new ImmutableLongValueImpl(v);
5649
}
5750

58-
public static ImmutableIntegerValue newIntegerValue(int v) {
51+
public static ImmutableIntegerValue newInteger(int v) {
5952
return new ImmutableLongValueImpl(v);
6053
}
6154

62-
public static ImmutableIntegerValue newIntegerValue(long v) {
55+
public static ImmutableIntegerValue newInteger(long v) {
6356
return new ImmutableLongValueImpl(v);
6457
}
6558

66-
public static ImmutableIntegerValue newIntegerValue(BigInteger v) {
59+
public static ImmutableIntegerValue newInteger(BigInteger v) {
6760
return new ImmutableBigIntegerValueImpl(v);
6861
}
6962

70-
public static ImmutableFloatValue newFloatValue(float v) {
63+
public static ImmutableFloatValue newFloat(float v) {
7164
return new ImmutableDoubleValueImpl(v);
7265
}
7366

74-
public static ImmutableFloatValue newFloatValue(double v) {
67+
public static ImmutableFloatValue newFloat(double v) {
7568
return new ImmutableDoubleValueImpl(v);
7669
}
7770

78-
public static ImmutableBinaryValue newBinaryValue(byte[] b) {
71+
public static ImmutableBinaryValue newBinary(byte[] b) {
7972
return new ImmutableBinaryValueImpl(b);
8073
}
8174

82-
public static ImmutableBinaryValue newBinaryValue(byte[] b, int off, int len) {
75+
public static ImmutableBinaryValue newBinary(byte[] b, int off, int len) {
8376
return new ImmutableBinaryValueImpl(Arrays.copyOfRange(b, off, len));
8477
}
8578

86-
public static ImmutableStringValue newStringValue(String s) {
79+
public static ImmutableStringValue newString(String s) {
8780
return new ImmutableStringValueImpl(s);
8881
}
8982

90-
public static ImmutableStringValue newStringValue(byte[] b) {
83+
public static ImmutableStringValue newString(byte[] b) {
9184
return new ImmutableStringValueImpl(b);
9285
}
9386

94-
public static ImmutableStringValue newStringValue(byte[] b, int off, int len) {
87+
public static ImmutableStringValue newString(byte[] b, int off, int len) {
9588
return new ImmutableStringValueImpl(Arrays.copyOfRange(b, off, len));
9689
}
9790

98-
public static ImmutableArrayValue newArrayValue(List<? extends Value> list) {
91+
public static ImmutableArrayValue newArray(List<? extends Value> list) {
9992
if (list.isEmpty()) {
10093
return ImmutableArrayValueImpl.empty();
10194
}
10295
Value[] array = list.toArray(new Value[list.size()]);
10396
return new ImmutableArrayValueImpl(array);
10497
}
10598

106-
public static ImmutableArrayValue newArrayValue(Value[] array) {
99+
public static ImmutableArrayValue newArray(Value[] array) {
107100
if (array.length == 0) {
108101
return ImmutableArrayValueImpl.empty();
109102
}
110103
return new ImmutableArrayValueImpl(Arrays.copyOf(array, array.length));
111104
}
112105

113106
public static <K extends Value, V extends Value>
114-
ImmutableMapValue newMapValue(Map<K, V> map) {
107+
ImmutableMapValue newMap(Map<K, V> map) {
115108
Value[] kvs = new Value[map.size() * 2];
116109
Iterator<Map.Entry<K, V>> ite = map.entrySet().iterator();
117110
int index = 0;
@@ -122,17 +115,62 @@ ImmutableMapValue newMapValue(Map<K, V> map) {
122115
kvs[index] = pair.getValue();
123116
index++;
124117
}
125-
return newMapValue(kvs);
118+
return newMap(kvs);
126119
}
127120

128-
public static ImmutableMapValue newMapValue(Value[] kvs) {
121+
public static ImmutableMapValue newMap(Value[] kvs) {
129122
if (kvs.length == 0) {
130123
return ImmutableMapValueImpl.empty();
131124
}
132125
return new ImmutableMapValueImpl(Arrays.copyOf(kvs, kvs.length));
133126
}
134127

135-
public static ImmutableExtensionValue newExtensionValue(byte type, byte[] data) {
128+
public static class MapEntry {
129+
public final Value key;
130+
public final Value value;
131+
132+
public MapEntry(Value key, Value value) {
133+
this.key = key;
134+
this.value = value;
135+
}
136+
}
137+
138+
public static MapValue newMap(MapEntry... pairs) {
139+
MapBuilder b = new MapBuilder();
140+
for(MapEntry p : pairs) {
141+
b.put(p);
142+
}
143+
return b.build();
144+
}
145+
146+
147+
public static MapBuilder newMapBuilder() {
148+
return new MapBuilder();
149+
}
150+
151+
public static MapEntry newMapEntry(Value key, Value value) {
152+
return new MapEntry(key, value);
153+
154+
}
155+
156+
public static class MapBuilder {
157+
private Map<Value, Value> map = new HashMap<Value, Value>();
158+
public MapBuilder() {}
159+
160+
public MapValue build() {
161+
return newMap(map);
162+
}
163+
164+
public void put(MapEntry pair) {
165+
put(pair.key, pair.value);
166+
}
167+
168+
public void put(Value key, Value value) {
169+
map.put(key, value);
170+
}
171+
}
172+
173+
public static ImmutableExtensionValue newExtension(byte type, byte[] data) {
136174
return new ImmutableExtensionValueImpl(type, data);
137175
}
138176
}

‎msgpack-core/src/main/java/org/msgpack/value/Variable.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public NilValue asNilValue() {
232232

233233
@Override
234234
public ImmutableNilValue immutableValue() {
235-
return ValueFactory.newNilValue();
235+
return ValueFactory.nil();
236236
}
237237

238238
@Override
@@ -266,7 +266,7 @@ public BooleanValue asBooleanValue() {
266266

267267
@Override
268268
public ImmutableBooleanValue immutableValue() {
269-
return ValueFactory.newBooleanValue(getBoolean());
269+
return ValueFactory.newBoolean(getBoolean());
270270
}
271271

272272
@Override
@@ -405,9 +405,9 @@ public IntegerValue asIntegerValue() {
405405
@Override
406406
public ImmutableIntegerValue immutableValue() {
407407
if (type == Type.BIG_INTEGER) {
408-
return ValueFactory.newIntegerValue((BigInteger) objectValue);
408+
return ValueFactory.newInteger((BigInteger) objectValue);
409409
}
410-
return ValueFactory.newIntegerValue(longValue);
410+
return ValueFactory.newInteger(longValue);
411411
}
412412

413413
@Override
@@ -514,7 +514,7 @@ public FloatValue asFloatValue() {
514514

515515
@Override
516516
public ImmutableFloatValue immutableValue() {
517-
return ValueFactory.newFloatValue(doubleValue);
517+
return ValueFactory.newFloat(doubleValue);
518518
}
519519

520520
@Override
@@ -602,7 +602,7 @@ public BinaryValue asBinaryValue() {
602602

603603
@Override
604604
public ImmutableBinaryValue immutableValue() {
605-
return ValueFactory.newBinaryValue(getByteArray());
605+
return ValueFactory.newBinary(getByteArray());
606606
}
607607

608608
@Override
@@ -642,7 +642,7 @@ public StringValue asStringValue() {
642642

643643
@Override
644644
public ImmutableStringValue immutableValue() {
645-
return ValueFactory.newStringValue((byte[]) objectValue);
645+
return ValueFactory.newString((byte[]) objectValue);
646646
}
647647

648648
@Override
@@ -678,7 +678,7 @@ public ArrayValue asArrayValue() {
678678

679679
@Override
680680
public ImmutableArrayValue immutableValue() {
681-
return ValueFactory.newArrayValue(list());
681+
return ValueFactory.newArray(list());
682682
}
683683

684684
@Override
@@ -695,7 +695,7 @@ public Value get(int index) {
695695
public Value getOrNilValue(int index) {
696696
List<Value> l = list();
697697
if (l.size() < index && index >= 0) {
698-
return ValueFactory.newNilValue();
698+
return ValueFactory.nil();
699699
}
700700
return l.get(index);
701701
}
@@ -745,7 +745,7 @@ public MapValue asMapValue() {
745745

746746
@Override
747747
public ImmutableMapValue immutableValue() {
748-
return ValueFactory.newMapValue(map());
748+
return ValueFactory.newMap(map());
749749
}
750750

751751
@Override
@@ -808,7 +808,7 @@ public void writeTo(MessagePacker pk) throws IOException {
808808
public Variable setExtensionValue(byte type, byte[] data) {
809809
this.type = Type.EXTENSION;
810810
this.accessor = extensionAccessor;
811-
this.objectValue = ValueFactory.newExtensionValue(type, data);
811+
this.objectValue = ValueFactory.newExtension(type, data);
812812
return this;
813813
}
814814

‎msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ private ImmutableBooleanValueImpl(boolean value) {
4141
this.value = value;
4242
}
4343

44-
public static ImmutableBooleanValue trueInstance() {
45-
return TRUE;
46-
}
47-
48-
public static ImmutableBooleanValue falseInstance() {
49-
return FALSE;
50-
}
51-
5244
@Override
5345
public ValueType getValueType() {
5446
return ValueType.BOOLEAN;

‎msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ValueFactoryTest extends MessagePackSpec {
4545
forAll{(v:Array[Byte]) => isValid(ValueFactory.newBinary(v), expected=ValueType.BINARY, isBinary = true, isRaw = true)}
4646
isValid(ValueFactory.emptyArray(), expected=ValueType.ARRAY, isArray = true)
4747
isValid(ValueFactory.emptyMap(), expected=ValueType.MAP, isMap = true)
48-
forAll{(v:Array[Byte]) => isValid(ValueFactory.newExtensionValue(0, v), expected=ValueType.EXTENSION, isExtension=true, isRaw=true)}
48+
forAll{(v:Array[Byte]) => isValid(ValueFactory.newExtension(0, v), expected=ValueType.EXTENSION, isExtension=true, isRaw=true)}
4949
}
5050

5151
}

‎msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class MessagePackParser extends ParserMinimalBase {
2929
private JsonReadContext parsingContext;
3030

3131
private final LinkedList<StackItem> stack = new LinkedList<StackItem>();
32-
private Value value = ValueFactory.newNilValue();
32+
private Value value = ValueFactory.nil();
3333
private Variable var = new Variable();
3434
private boolean isClosed;
3535
private long tokenPosition;
@@ -141,12 +141,12 @@ public JsonToken nextToken() throws IOException, JsonParseException {
141141
switch (type) {
142142
case NIL:
143143
messageUnpacker.unpackNil();
144-
value = ValueFactory.newNilValue();
144+
value = ValueFactory.nil();
145145
nextToken = JsonToken.VALUE_NULL;
146146
break;
147147
case BOOLEAN:
148148
boolean b = messageUnpacker.unpackBoolean();
149-
value = ValueFactory.newNilValue();
149+
value = ValueFactory.nil();
150150
nextToken = b ? JsonToken.VALUE_TRUE : JsonToken.VALUE_FALSE;
151151
break;
152152
case INTEGER:
@@ -178,11 +178,11 @@ public JsonToken nextToken() throws IOException, JsonParseException {
178178
}
179179
break;
180180
case ARRAY:
181-
value = ValueFactory.newNilValue();
181+
value = ValueFactory.nil();
182182
newStack = new StackItemForArray(messageUnpacker.unpackArrayHeader());
183183
break;
184184
case MAP:
185-
value = ValueFactory.newNilValue();
185+
value = ValueFactory.nil();
186186
newStack = new StackItemForObject(messageUnpacker.unpackMapHeader());
187187
break;
188188
case EXTENSION:

0 commit comments

Comments
 (0)