This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch sonar in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit d4fba4e32aad28f809fb3ea655bbe59f629f1de2 Author: Bertil Chapuis <[email protected]> AuthorDate: Thu Jun 13 20:34:14 2024 +0200 Rename class because record is reserved --- .../baremaps/geocoder/GeonamesDocumentMapper.java | 50 +++++++++++----------- .../{GeonamesRecord.java => GeonamesEntry.java} | 4 +- .../apache/baremaps/geocoder/GeonamesReader.java | 8 ++-- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesDocumentMapper.java b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesDocumentMapper.java index b1afc1d1..7f704aff 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesDocumentMapper.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesDocumentMapper.java @@ -24,38 +24,38 @@ import org.apache.baremaps.utils.IsoCountriesUtils; import org.apache.lucene.document.*; /** - * Maps a {@link GeonamesRecord} to a Lucene {@link Document}. + * Maps a {@link GeonamesEntry} to a Lucene {@link Document}. */ -public class GeonamesDocumentMapper implements Function<GeonamesRecord, Document> { +public class GeonamesDocumentMapper implements Function<GeonamesEntry, Document> { @Override - public Document apply(GeonamesRecord record) { + public Document apply(GeonamesEntry entry) { Document document = new Document(); - document.add(new TextField("name", record.getName(), Field.Store.YES)); - document.add(new TextField("country", IsoCountriesUtils.getCountry(record.getCountryCode()), + document.add(new TextField("name", entry.getName(), Field.Store.YES)); + document.add(new TextField("country", IsoCountriesUtils.getCountry(entry.getCountryCode()), Field.Store.YES)); // countryCode is not analyzed and thus must be queried using uppercase - document.add(new StringField("countryCode", record.getCountryCode(), Field.Store.YES)); - document.add(new LatLonPoint("point", record.getLatitude(), record.getLongitude())); - document.add(new StoredField("longitude", record.getLongitude())); - document.add(new StoredField("latitude", record.getLatitude())); - document.add(new TextField("asciiname", record.getAsciiname(), Field.Store.YES)); - document.add(new StoredField("alternatenames", record.getAlternatenames())); - document.add(new StringField("featureClass", record.getFeatureClass(), Field.Store.YES)); - document.add(new StringField("featureCode", record.getFeatureCode(), Field.Store.YES)); - document.add(new StoredField("cc2", record.getCc2())); - document.add(new StoredField("admin1Code", record.getAdmin1Code())); - document.add(new StoredField("admin2Code", record.getAdmin2Code())); - document.add(new StoredField("admin3Code", record.getAdmin3Code())); - document.add(new StoredField("admin4Code", record.getAdmin4Code())); - document.add(new NumericDocValuesField("population", record.getPopulation())); - document.add(new StoredField("population", record.getPopulation())); - if (record.getElevation() != null) { - document.add(new StoredField("elevation", record.getElevation())); + document.add(new StringField("countryCode", entry.getCountryCode(), Field.Store.YES)); + document.add(new LatLonPoint("point", entry.getLatitude(), entry.getLongitude())); + document.add(new StoredField("longitude", entry.getLongitude())); + document.add(new StoredField("latitude", entry.getLatitude())); + document.add(new TextField("asciiname", entry.getAsciiname(), Field.Store.YES)); + document.add(new StoredField("alternatenames", entry.getAlternatenames())); + document.add(new StringField("featureClass", entry.getFeatureClass(), Field.Store.YES)); + document.add(new StringField("featureCode", entry.getFeatureCode(), Field.Store.YES)); + document.add(new StoredField("cc2", entry.getCc2())); + document.add(new StoredField("admin1Code", entry.getAdmin1Code())); + document.add(new StoredField("admin2Code", entry.getAdmin2Code())); + document.add(new StoredField("admin3Code", entry.getAdmin3Code())); + document.add(new StoredField("admin4Code", entry.getAdmin4Code())); + document.add(new NumericDocValuesField("population", entry.getPopulation())); + document.add(new StoredField("population", entry.getPopulation())); + if (entry.getElevation() != null) { + document.add(new StoredField("elevation", entry.getElevation())); } - document.add(new StoredField("dem", record.getDem())); - document.add(new StoredField("timezone", record.getTimezone())); - document.add(new StoredField("modificationDate", record.getModificationDate())); + document.add(new StoredField("dem", entry.getDem())); + document.add(new StoredField("timezone", entry.getTimezone())); + document.add(new StoredField("modificationDate", entry.getModificationDate())); return document; } } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesRecord.java b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesEntry.java similarity index 98% rename from baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesRecord.java rename to baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesEntry.java index 56138ee8..601cc3b0 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesRecord.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesEntry.java @@ -20,7 +20,7 @@ package org.apache.baremaps.geocoder; /** * A record from the Geonames database. */ -public class GeonamesRecord { +public class GeonamesEntry { // integer id of record in geonames database private Integer geonameid; @@ -84,7 +84,7 @@ public class GeonamesRecord { // date of last modification in yyyy-MM-dd format private String modificationDate; - public GeonamesRecord() { + public GeonamesEntry() { // Default constructor } diff --git a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesReader.java b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesReader.java index 768f283b..b35c4c45 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesReader.java @@ -37,7 +37,7 @@ import java.util.stream.StreamSupport; */ public class GeonamesReader { - public Stream<GeonamesRecord> stream(InputStream inputStream) throws IOException { + public Stream<GeonamesEntry> stream(InputStream inputStream) throws IOException { CsvMapper mapper = new CsvMapper(); CsvSchema schema = CsvSchema.builder() @@ -65,11 +65,11 @@ public class GeonamesReader { .withoutQuoteChar(); var reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); - MappingIterator<GeonamesRecord> recordIterator = mapper - .readerFor(GeonamesRecord.class) + MappingIterator<GeonamesEntry> recordIterator = mapper + .readerFor(GeonamesEntry.class) .with(schema) .readValues(reader); - Spliterator<GeonamesRecord> recordSpliterator = + Spliterator<GeonamesEntry> recordSpliterator = Spliterators.spliteratorUnknownSize(recordIterator, 0); return StreamSupport.stream(recordSpliterator, false);
