fixes review

Author: EvgeniiMunin

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java

@@ -2,6 +2,7 @@
 
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageException;
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
 import com.maxmind.geoip2.DatabaseReader;
@@ -38,7 +39,7 @@ public DatabaseReaderFactory(String gcsBucketName, String geoLiteCountryPath, Ve
     public void initialize(Promise<Void> initializePromise) {
         vertx.executeBlocking(() -> {
             try {
-                final Blob blob = getBlob(geoLiteCountryPath);
+                final Blob blob = getBlob();
                 final Path databasePath = Files.createTempFile("GeoLite2-Country", ".mmdb");
 
                 try (FileOutputStream outputStream = new FileOutputStream(databasePath.toFile())) {
@@ -54,10 +55,14 @@ public void initialize(Promise<Void> initializePromise) {
         .onComplete(initializePromise);
     }
 
-    private Blob getBlob(String geoLiteCountryPath) {
-        return Optional.ofNullable(storage.get(gcsBucketName))
-                .map(bucket -> bucket.get(geoLiteCountryPath))
-                .orElseThrow(() -> new PreBidException("Bucket not found: " + gcsBucketName));
+    private Blob getBlob() {
+        try {
+            return Optional.ofNullable(storage.get(gcsBucketName))
+                    .map(bucket -> bucket.get(geoLiteCountryPath))
+                    .orElseThrow(() -> new PreBidException("Bucket not found: " + gcsBucketName));
+        } catch (StorageException e) {
+            throw new PreBidException("Error accessing GCS artefact for model: ", e);
+        }
     }
 
     public DatabaseReader getDatabaseReader() {

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java

@@ -33,7 +33,8 @@ public class GreenbidsRealTimeDataConfiguration {
     @Bean
     DatabaseReaderFactory databaseReaderFactory(
             GreenbidsRealTimeDataProperties properties, Vertx vertx, Storage storage) {
-        return new DatabaseReaderFactory(properties.gcsBucketName, properties.getGeoLiteCountryPath(), vertx, storage);
+        return new DatabaseReaderFactory(
+                properties.getGcsBucketName(), properties.getGeoLiteCountryPath(), vertx, storage);
     }
 
     @Bean

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataService.java

@@ -90,7 +90,7 @@ private List<ThrottlingMessage> extractMessagesForImp(
         final String country = Optional.ofNullable(bidRequest.getDevice())
                 .map(Device::getGeo)
                 .map(Geo::getCountry)
-                .orElse(getCountry(ip));
+                .orElseGet(() -> getCountry(ip));
 
         return createThrottlingMessages(
                 bidderNode,

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java

@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult;
 import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
@@ -66,6 +65,7 @@
 
 import static java.util.function.UnaryOperator.identity;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mock.Strictness.LENIENT;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -104,10 +104,10 @@ public void setUp() throws IOException, GeoIp2Exception {
         final Storage storage = StorageOptions.newBuilder()
                 .setProjectId("test_project").build().getService();
 
-        Mockito.when(country.getName()).thenReturn("United States");
-        Mockito.when(countryResponse.getCountry()).thenReturn(country);
-        Mockito.when(databaseReader.country(Mockito.any(InetAddress.class))).thenReturn(countryResponse);
-        Mockito.when(databaseReaderFactory.getDatabaseReader()).thenReturn(databaseReader);
+        when(country.getName()).thenReturn("United States");
+        when(countryResponse.getCountry()).thenReturn(country);
+        when(databaseReader.country(any(InetAddress.class))).thenReturn(countryResponse);
+        when(databaseReaderFactory.getDatabaseReader()).thenReturn(databaseReader);
 
         final FilterService filterService = new FilterService();
         final OnnxModelRunnerFactory onnxModelRunnerFactory = new OnnxModelRunnerFactory();