Skip to content

Commit 0428113

Browse files
committed
Rename these variables
There's too many nearby things named record or result or response. So here's a new word, 'entry'. A database has a bunch of entries in it.
1 parent 791fb1d commit 0428113

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IpinfoIpDataLookups.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,9 @@ public final Map<String, Object> getData(final IpDatabase ipDatabase, final Stri
490490
@Nullable
491491
private Result<RESPONSE> lookup(final Reader reader, final String ipAddress) throws IOException {
492492
final InetAddress ip = InetAddresses.forString(ipAddress);
493-
final DatabaseRecord<RESPONSE> record = reader.getRecord(ip, clazz);
494-
final RESPONSE data = record.getData();
495-
return (data == null) ? null : new Result<>(data, NetworkAddress.format(ip), record.getNetwork().toString());
493+
final DatabaseRecord<RESPONSE> entry = reader.getRecord(ip, clazz);
494+
final RESPONSE data = entry.getData();
495+
return (data == null) ? null : new Result<>(data, NetworkAddress.format(ip), entry.getNetwork().toString());
496496
}
497497

498498
/**

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/MaxmindIpDataLookups.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,9 +818,9 @@ public final Map<String, Object> getData(final IpDatabase ipDatabase, final Stri
818818
@Nullable
819819
private RECORD lookup(final Reader reader, final String ipAddress) throws IOException {
820820
final InetAddress ip = InetAddresses.forString(ipAddress);
821-
final DatabaseRecord<RESPONSE> record = reader.getRecord(ip, clazz);
822-
final RESPONSE data = record.getData();
823-
return (data == null) ? null : record(builder.build(data, NetworkAddress.format(ip), record.getNetwork(), List.of("en")));
821+
final DatabaseRecord<RESPONSE> entry = reader.getRecord(ip, clazz);
822+
final RESPONSE data = entry.getData();
823+
return (data == null) ? null : record(builder.build(data, NetworkAddress.format(ip), entry.getNetwork(), List.of("en")));
824824
}
825825

826826
/**

0 commit comments

Comments
 (0)