Skip to content

Fix CSV import data loss and restore null response check #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −15
Open

Fix CSV import data loss and restore null response check #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions src/main/java/fun/wilddev/geo/importer/LocationFileImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,36 @@ public int startImport() throws FileReaderException {
String[] line;
List<LocationD> buff = new ArrayList<>(BUFF_SIZE);

for (int i = 0; (line = csv.readNext()) != null; i++) {
while ((line = csv.readNext()) != null) {

if (i % BUFF_SIZE == 0) {
if (line.length < 3) {

locationRepository.saveAll(buff);
buff.clear();

log.debug("Flushed");
log.debug("Bad entry, skipping ...");
continue;
}

} else {
LocationD location = new LocationD(new Country(line[1], line[0]), line[2]);

if (line.length < 3) {
buff.add(location);
counter++;

log.debug("Bad entry, skipping ...");
continue;
}
log.info("Location read: {}", location);

LocationD location = new LocationD(new Country(line[1], line[0]), line[2]);
if (buff.size() >= BUFF_SIZE) {

buff.add(location);
counter++;
locationRepository.saveAll(buff);
buff.clear();

log.info("Location read: {}", location);
log.debug("Flushed");
}
}

if (!buff.isEmpty()) {

locationRepository.saveAll(buff);
log.debug("Flushed remaining");
}

} catch (Exception ex) {
throw new FileReaderException("Failed to read location file", ex);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fun/wilddev/geo/integrations/ipstack/IpStackHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public Location find(@NonNull String ip) throws HttpRequestFailedException {

val source = response.bodyTo(IpStackLocationResponse.class);

if (source == null)
throw new HttpRequestFailedException("null response");

if (source.getSuccess() == Boolean.FALSE)
throw new HttpRequestFailedException("Request rejected: " + source);

Expand Down
Loading