Skip to content

Commit d294eb6

Browse files
oschwaldoschwald
committed
Rename result object methods
1 parent 1d8364c commit d294eb6

4 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/main/java/com/maxmind/maxminddb/Decoder.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ public class Decoder {
3030
private final ObjectMapper objectMapper;
3131

3232
class Result {
33-
private final JsonNode obj;
33+
private final JsonNode node;
3434
private long offset;
3535

36-
Result(JsonNode obj, long offset) {
37-
this.obj = obj;
36+
Result(JsonNode node, long offset) {
37+
this.node = node;
3838
this.offset = offset;
3939

4040
}
4141

42-
JsonNode getObject() {
43-
return this.obj;
42+
JsonNode getNode() {
43+
return this.node;
4444
}
4545

4646
long getOffset() {
@@ -90,7 +90,7 @@ public Result decode(long offset) throws MaxMindDbException, IOException {
9090
if (this.POINTER_TEST_HACK) {
9191
return pointer;
9292
}
93-
Result result = this.decode((pointer.getObject().asLong()));
93+
Result result = this.decode((pointer.getNode().asLong()));
9494
result.setOffset(pointer.getOffset());
9595
return result;
9696
}
@@ -277,9 +277,9 @@ private Result decodeArray(long size, long offset)
277277
offset = r.getOffset();
278278

279279
if (this.DEBUG) {
280-
Log.debug("Value " + i, r.getObject().toString());
280+
Log.debug("Value " + i, r.getNode().toString());
281281
}
282-
array.add(r.getObject());
282+
array.add(r.getNode());
283283
}
284284

285285
if (this.DEBUG) {
@@ -299,11 +299,11 @@ private Result decodeMap(long size, long offset) throws MaxMindDbException,
299299

300300
for (int i = 0; i < size; i++) {
301301
Result keyResult = this.decode(offset);
302-
String key = keyResult.getObject().asText();
302+
String key = keyResult.getNode().asText();
303303
offset = keyResult.getOffset();
304304

305305
Result valueResult = this.decode(offset);
306-
JsonNode value = valueResult.getObject();
306+
JsonNode value = valueResult.getNode();
307307
offset = valueResult.getOffset();
308308

309309
if (this.DEBUG) {

‎src/main/java/com/maxmind/maxminddb/Reader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Reader(File database) throws MaxMindDbException, IOException {
5555

5656
Decoder metadataDecoder = new Decoder(this.fc, 0);
5757

58-
this.metadata = new Metadata(metadataDecoder.decode(start).getObject());
58+
this.metadata = new Metadata(metadataDecoder.decode(start).getNode());
5959

6060
this.decoder = new Decoder(this.fc, this.metadata.searchTreeSize
6161
+ DATA_SECTION_SEPARATOR_SIZE);
@@ -200,7 +200,7 @@ private JsonNode resolveDataPointer(long pointer)
200200

201201
// We only want the data from the decoder, not the offset where it was
202202
// found.
203-
return this.decoder.decode(resolved).getObject();
203+
return this.decoder.decode(resolved).getNode();
204204
}
205205

206206
/*

‎src/test/java/com/maxmind/maxminddb/DecoderTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -393,31 +393,31 @@ static <T> void testTypeDecoding(Type type, Map<T, byte[]> tests)
393393
// XXX - this could be streamlined
394394
if (type.equals(Type.BYTES)) {
395395
assertArrayEquals(desc, (byte[]) expect, decoder.decode(0)
396-
.getObject().binaryValue());
396+
.getNode().binaryValue());
397397
} else if (type.equals(Type.ARRAY)) {
398-
assertEquals(desc, expect, decoder.decode(0).getObject());
398+
assertEquals(desc, expect, decoder.decode(0).getNode());
399399
} else if (type.equals(Type.UINT16) || type.equals(Type.INT32)) {
400-
assertEquals(desc, expect, decoder.decode(0).getObject()
400+
assertEquals(desc, expect, decoder.decode(0).getNode()
401401
.asInt());
402402
} else if (type.equals(Type.UINT32)
403403
|| type.equals(Type.POINTER)) {
404-
assertEquals(desc, expect, decoder.decode(0).getObject()
404+
assertEquals(desc, expect, decoder.decode(0).getNode()
405405
.asLong());
406406
} else if (type.equals(Type.UINT64)
407407
|| type.equals(Type.UINT128)) {
408-
assertEquals(desc, expect, decoder.decode(0).getObject()
408+
assertEquals(desc, expect, decoder.decode(0).getNode()
409409
.bigIntegerValue());
410410
} else if (type.equals(Type.DOUBLE)) {
411-
assertEquals(desc, expect, decoder.decode(0).getObject()
411+
assertEquals(desc, expect, decoder.decode(0).getNode()
412412
.asDouble());
413413
} else if (type.equals(Type.UTF8_STRING)) {
414-
assertEquals(desc, expect, decoder.decode(0).getObject()
414+
assertEquals(desc, expect, decoder.decode(0).getNode()
415415
.asText());
416416
} else if (type.equals(Type.BOOLEAN)) {
417-
assertEquals(desc, expect, decoder.decode(0).getObject()
417+
assertEquals(desc, expect, decoder.decode(0).getNode()
418418
.asBoolean());
419419
} else {
420-
assertEquals(desc, expect, decoder.decode(0).getObject());
420+
assertEquals(desc, expect, decoder.decode(0).getNode());
421421
}
422422
} finally {
423423
if (fc != null) {

‎src/test/java/com/maxmind/maxminddb/PointerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ public void testWithPointers() throws MaxMindDbException, IOException {
2626

2727
ObjectNode map = om.createObjectNode();
2828
map.put("long_key", "long_value1");
29-
assertEquals(map, decoder.decode(0).getObject());
29+
assertEquals(map, decoder.decode(0).getNode());
3030

3131
map = om.createObjectNode();
3232
map.put("long_key", "long_value2");
33-
assertEquals(map, decoder.decode(22).getObject());
33+
assertEquals(map, decoder.decode(22).getNode());
3434

3535
map = om.createObjectNode();
3636
map.put("long_key2", "long_value1");
37-
assertEquals(map, decoder.decode(37).getObject());
37+
assertEquals(map, decoder.decode(37).getNode());
3838

3939
map = om.createObjectNode();
4040
map.put("long_key2", "long_value2");
41-
assertEquals(map, decoder.decode(50).getObject());
41+
assertEquals(map, decoder.decode(50).getNode());
4242

4343
map = om.createObjectNode();
4444
map.put("long_key", "long_value1");
45-
assertEquals(map, decoder.decode(55).getObject());
45+
assertEquals(map, decoder.decode(55).getNode());
4646

4747
map = om.createObjectNode();
4848
map.put("long_key2", "long_value2");
49-
assertEquals(map, decoder.decode(57).getObject());
49+
assertEquals(map, decoder.decode(57).getNode());
5050
} finally {
5151
if (fc != null) {
5252
fc.close();

0 commit comments

Comments
 (0)