diff --git a/extra/modules/greenbids-real-time-data/pom.xml b/extra/modules/greenbids-real-time-data/pom.xml
index 7e8c9f8e095..c4dd9fd52f3 100644
--- a/extra/modules/greenbids-real-time-data/pom.xml
+++ b/extra/modules/greenbids-real-time-data/pom.xml
@@ -29,6 +29,12 @@
com.google.cloud
google-cloud-storage
2.41.0
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/extra/pom.xml b/extra/pom.xml
index 6ea6fddf3ce..89a23926471 100644
--- a/extra/pom.xml
+++ b/extra/pom.xml
@@ -41,14 +41,14 @@
4.5.14
5.3.1
6.4.5
- 1.0.76
+ 1.4.0
1.13
2.2.0
1.2.2
0.16.0
2.0.10
3.2.0
- 2.12.0
+ 2.17.0
3.25.5
${protobuf.version}
1.0.7
@@ -130,6 +130,12 @@
org.apache.httpcomponents
httpclient
${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
com.github.seancfoley
@@ -248,6 +254,10 @@
com.google.code.findbugs
jsr305
+
+ commons-logging
+ commons-logging
+
diff --git a/src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy
index 1ead8c32708..4e544498f44 100644
--- a/src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy
+++ b/src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy
@@ -228,11 +228,12 @@ class AliasSpec extends BaseSpec {
assert bidResponse.ext?.warnings[PREBID]*.message ==
["WARNING: request.imp[0].ext.prebid.bidder.${APPNEXUS.value} was dropped with a reason: " +
"request.imp[0].ext.prebid.bidder.${APPNEXUS.value} failed validation.\n" +
- "\$.placement_id: is missing but it is required\n" +
- "\$.member: is missing but it is required\n" +
- "\$.placementId: is missing but it is required\n" +
- "\$.inv_code: is missing but it is required\n" +
- "\$.invCode: is missing but it is required",
+ "\$: must be valid to one and only one schema, but 0 are valid\n" +
+ "\$: required property 'placement_id' not found\n" +
+ "\$: required property 'inv_code' not found\n" +
+ "\$: required property 'placementId' not found\n" +
+ "\$: required property 'member' not found\n" +
+ "\$: required property 'invCode' not found",
"WARNING: request.imp[0].ext must contain at least one valid bidder"]
}
diff --git a/src/test/java/org/prebid/server/geolocation/MaxMindGeoLocationServiceTest.java b/src/test/java/org/prebid/server/geolocation/MaxMindGeoLocationServiceTest.java
index 26c84310934..d296dbb19a2 100644
--- a/src/test/java/org/prebid/server/geolocation/MaxMindGeoLocationServiceTest.java
+++ b/src/test/java/org/prebid/server/geolocation/MaxMindGeoLocationServiceTest.java
@@ -16,7 +16,6 @@
import org.prebid.server.geolocation.model.GeoInfo;
import java.io.IOException;
-import java.util.ArrayList;
import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
@@ -62,21 +61,37 @@ public void setDatabaseReaderShouldReturnFailedFutureIfDatabaseArchiveNotFound()
public void lookupShouldReturnCountryIsoWhenDatabaseReaderWasSet() throws NoSuchFieldException, IOException,
GeoIp2Exception, IllegalAccessException {
// given
- final Country country = new Country(null, null, null, "fr", null);
- final Continent continent = new Continent(null, "eu", null, null);
- final City city = new City(singletonList("test"), null, null, singletonMap("test", "Paris"));
- final Location location = new Location(null, null, 48.8566, 2.3522,
- null, null, null);
- final ArrayList subdivisions = new ArrayList<>();
- subdivisions.add(new Subdivision(null, null, null, "paris", null));
- final CityResponse cityResponse = new CityResponse(city, continent, country, location, null,
- null, null, null, subdivisions, null);
+ final Country country = Mockito.mock(Country.class);
+ Mockito.when(country.getIsoCode()).thenReturn("fr");
+
+ final Continent continent = Mockito.mock(Continent.class);
+ Mockito.when(continent.getCode()).thenReturn("eu");
+
+ final City city = Mockito.mock(City.class);
+ Mockito.when(city.getNames()).thenReturn(singletonMap("en", "Paris"));
+ Mockito.when(city.getName()).thenReturn("Paris");
+
+ final Location location = Mockito.mock(Location.class);
+ Mockito.when(location.getLatitude()).thenReturn(48.8566);
+ Mockito.when(location.getLongitude()).thenReturn(2.3522);
+
+ final Subdivision subdivision = Mockito.mock(Subdivision.class);
+ Mockito.when(subdivision.getIsoCode()).thenReturn("paris");
+
+ final CityResponse cityResponse = Mockito.mock(CityResponse.class);
+ Mockito.when(cityResponse.getCountry()).thenReturn(country);
+ Mockito.when(cityResponse.getContinent()).thenReturn(continent);
+ Mockito.when(cityResponse.getCity()).thenReturn(city);
+ Mockito.when(cityResponse.getLocation()).thenReturn(location);
+ Mockito.when(cityResponse.getSubdivisions()).thenReturn(singletonList(subdivision));
final DatabaseReader databaseReader = Mockito.mock(DatabaseReader.class);
given(databaseReader.city(any())).willReturn(cityResponse);
- new ReflectionMemberAccessor().set(maxMindGeoLocationService.getClass().getDeclaredField("databaseReader"),
- maxMindGeoLocationService, databaseReader);
+ new ReflectionMemberAccessor().set(
+ maxMindGeoLocationService.getClass().getDeclaredField("databaseReader"),
+ maxMindGeoLocationService,
+ databaseReader);
// when
final Future future = maxMindGeoLocationService.lookup(TEST_IP, null);
diff --git a/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java b/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java
index c0b99d22f38..9c207aa17bf 100644
--- a/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java
+++ b/src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java
@@ -133,7 +133,7 @@ public void validateShouldReturnValidationMessagesWhenAppnexusImpExtNotValid() {
final Set messages = bidderParamValidator.validate(APPNEXUS, node);
// then
- assertThat(messages.size()).isEqualTo(4);
+ assertThat(messages.size()).isEqualTo(5);
}
@Test
@@ -161,7 +161,7 @@ public void validateShouldReturnValidationMessagesWhenAppnexusAliasImpExtNotVali
final Set messages = bidderParamValidator.validate(APPNEXUS_ALIAS, node);
// then
- assertThat(messages.size()).isEqualTo(4);
+ assertThat(messages.size()).isEqualTo(5);
}
@Test
@@ -201,7 +201,7 @@ public void validateShouldReturnValidationMessagesWhenSovrnExtNotValid() {
final Set messages = bidderParamValidator.validate(SOVRN, node);
// then
- assertThat(messages.size()).isEqualTo(2);
+ assertThat(messages.size()).isEqualTo(3);
}
@Test
@@ -339,7 +339,7 @@ public void validateShouldReturnValidationMessagesWhenBeachfrontExtNotValid() {
final Set messages = bidderParamValidator.validate(BEACHFRONT, node);
// then
- assertThat(messages.size()).isEqualTo(2);
+ assertThat(messages.size()).isEqualTo(3);
}
@Test