fix review

prebid · Dec 30, 2024 · 38767d2 · 38767d2
1 parent 5efff00
commit 38767d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/...rg/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java b/...rg/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java
@@ -51,26 +51,15 @@ private Future<DatabaseReader> downloadAndExtract() {
         final String downloadUrl = properties.geoLiteCountryPath;
         final String tmpPath = properties.tmpPath;
         return downloadFile(downloadUrl, tmpPath)
-                .compose(unused -> {
-                    final DatabaseReader databaseReader;
-                    try {
-                        databaseReader = extractMMDB(tmpPath);
-                    } catch (RuntimeException e) {
-                        removeFile(tmpPath);
-                        throw new PreBidException("Failed to extract MMDB file. Removed file.", e);
-                    }
-                    removeFile(tmpPath);
-                    return Future.succeededFuture(databaseReader);
-                });
+                .flatMap(unused -> Future.succeededFuture(extractMMDB(tmpPath)))
+                .onComplete(ar -> removeFile(tmpPath));
     }
 
     private Future<Void> downloadFile(String downloadUrl, String tmpPath) {
-        return vertx.fileSystem().mkdirs(properties.tmpDir)
-                .compose(v -> vertx.fileSystem().open(tmpPath, new OpenOptions()))
+        return vertx.fileSystem().open(tmpPath, new OpenOptions())
                 .compose(tmpFile -> sendHttpRequest(downloadUrl)
                         .compose(response -> response.pipeTo(tmpFile))
                         .eventually(v -> tmpFile.close())
-                        .onSuccess(ignored -> logger.info("File downloaded successfully to {}", tmpPath))
                         .onFailure(error -> logger.error(
                                 "Failed to download file from {} to {}.", downloadUrl, tmpPath, error)));
     }
@@ -110,19 +99,18 @@ private DatabaseReader extractMMDB(String tarGzPath) {
             }
 
             if (!hasDatabaseFile) {
-                throw new RuntimeException("GeoLite2-Country.mmdb not found in the archive");
+                throw new PreBidException("GeoLite2-Country.mmdb not found in the archive");
             }
 
             return new DatabaseReader.Builder(tarInput)
                     .fileMode(Reader.FileMode.MEMORY).build();
         } catch (IOException e) {
-            throw new RuntimeException("Failed to extract MMDB file", e);
+            throw new PreBidException("Failed to extract MMDB file", e);
         }
     }
 
     private Future<Void> removeFile(String filePath) {
         return vertx.fileSystem().delete(filePath)
-                .onSuccess(ignored -> logger.info("File {} removed successfully", filePath))
                 .onFailure(err -> logger.error("Failed to remove file {}", filePath, err));
     }
 

diff --git a/...server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataProperties.java b/...server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataProperties.java
@@ -11,8 +11,6 @@ public class GreenbidsRealTimeDataProperties {
 
     String geoLiteCountryPath;
 
-    String tmpDir;
-
     String tmpPath;
 
     String gcsBucketName;