Commit 2b63ad0
committed
Merge remote-tracking branch 'origin/master' into non-bid-codes-in-modules
# Conflicts:
# extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java
# extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java
# extra/modules/ortb2-blocking/src/test/java/org/prebid/server/hooks/modules/ortb2/blocking/core/BidsBlockerTest.java
# extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java
# src/main/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporter.java
# src/main/java/org/prebid/server/auction/BidResponseCreator.java
# src/main/java/org/prebid/server/auction/model/BidRejectionTracker.java
# src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java
# src/test/java/org/prebid/server/auction/ExchangeServiceTest.java
# src/test/java/org/prebid/server/auction/model/BidRejectionTrackerTest.javaFile tree
1,338 files changed
+32905
-7658
lines changed- .github/workflows
- scripts
- .mvn/wrapper
- docs
- developers
- extra
- bundle
- modules
- confiant-ad-quality
- src
- main/java/org/prebid/server/hooks/modules/com/confiant/adquality
- config
- core
- model
- v1
- test/java/org/prebid/server/hooks/modules/com/confiant/adquality
- core
- util
- v1
- fiftyone-devicedetection
- src
- main/java/org/prebid/server/hooks/modules/fiftyone/devicedetection
- config
- model
- boundary
- config
- v1
- core
- hooks
- test/java/org/prebid/server/hooks/modules/fiftyone/devicedetection
- model/config
- v1
- core
- greenbids-real-time-data
- src
- main/java/org/prebid/server/hooks/modules/greenbids/real/time/data
- config
- core
- model/data
- v1
- test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core
- ortb2-blocking
- src
- main/java/org/prebid/server/hooks/modules/ortb2/blocking
- core
- v1
- test/java/org/prebid/server/hooks/modules/ortb2/blocking
- core
- config
- v1
- pb-request-correction
- src/main/java/org/prebid/server/hooks/modules/pb/request/correction
- core
- correction
- useragent
- util
- v1
- pb-response-correction
- src
- main/java/org/prebid/server/hooks/modules/pb/response/correction
- config
- v1
- test/java/org/prebid/server/hooks/modules/pb/response/correction
- core/correction/appvideohtml
- v1
- pb-richmedia-filter
- src
- main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core
- test/java/org/prebid/server/hooks/modules/pb/richmedia/filter
- core
- v1
- src
- main
- java
- com/iab/openrtb
- request
- ntv
- video
- response
- org/prebid/server
- activity/infrastructure
- creator
- privacy
- uscustomlogic
- usnat
- rule
- debug
- privacy
- uscustomlogic/reader
- usnat
- inner
- reader
- rule
- analytics
- model
- reporter
- agma
- model
- greenbids
- pubstack/model
- auction
- adjustment
- aliases
- categorymapping
- mediatypeprocessor
- model
- debug
- privacy/enforcement
- requestfactory
- bidadjustments
- model
- bidder
- adgeneration/model
- adhese
- model
- adkernel
- admatic
- adnuntius
- model
- request
- response
- adocean
- adoppler/model
- adquery/model/response
- advangelists
- adverxo
- aidem
- aja/proto
- algorix
- alkimi
- amx
- appnexus
- proto
- audiencenetwork/proto
- avocet/model
- axis
- axonix
- beachfront
- model
- connatix
- dxkulture
- eplanning
- model
- epsilon
- feedad
- gamma
- grid/model/request
- gumgum
- huaweiads
- model/response
- improvedigital/proto
- invibes
- ix/model/response
- kobler
- kueezrtb
- mabidder/response
- mgidx
- mgid
- model
- missena
- mobilefuse
- mobkoi
- model
- nextmillennium
- proto
- ogury
- oms
- openx
- proto
- operaads
- oraki
- ownadx
- pangle/model
- playdigo
- pubmatic
- model
- request
- response
- revcontent
- rise
- rubicon
- proto/request
- seedtag
- smaato
- smarthub
- smartrtb/model
- smartyads
- sonobi
- startio
- stroeercore/model
- teads
- telaria/model
- thetradedesk
- tpmn
- triplelift/model
- undertone
- unicorn
- model
- visx/model
- vrtcal
- vungle
- yieldlab/model
- yieldmo
- proto
- cache
- model
- cookie/model
- currency
- proto
- events
- execution
- file/syncer
- retry
- floors
- model
- proto
- geolocation
- handler
- admin
- openrtb2
- health/model
- hooks/execution
- model
- json
- merge
- log
- metric
- model
- privacy
- gdpr
- model
- tcfstrategies/purpose
- vendorlist
- proto
- protobuf/response
- proto
- openrtb/ext
- request
- aceex
- acuity
- adelement
- adgeneration
- adhese
- adkernel
- adocean
- adoppler
- adot
- adpone
- adprime
- advangelists
- adverxo
- adview
- adxcg
- adyoulike
- algorix
- amx
- axis
- axonix
- beachfront
- beintoo
- bidmyadz
- bidscube
- bmtm
- ccx
- concert
- connatix
- connectad
- consumable
- copper6ssp
- cpmstar
- datablocks
- decenterads
- deepintent
- emxdigital
- eplanning
- gamma
- gamoshi
- gumgum
- imds
- improvedigital
- inmobi
- interactiveoffers
- invibes
- model
- ix
- jixie
- kayzen
- kidoz
- kobler
- kueezrtb
- lockerdome
- lunamedia
- madvertise
- missena
- mobfoxpb
- mobilefuse
- mobkoi
- omx
- onetag
- openweb
- operaads
- orbidder
- outbrains
- pangle
- pubmatic
- pubnative
- pulsepoint
- relevantdigital
- resetdigital
- seedtag
- smaato
- smartadserver
- smarthub
- smartrtb
- smartyads
- sovrnxsp
- sovrn
- stroeercore
- tappx
- telaria
- theadx
- thetradedesk
- thirtythreeacross
- triplelift
- ucfunnel
- unicorn
- vrtcal
- yahooads
- yieldmo
- yieldone
- zeroclickfraud
- response
- request
- response
- settings
- helper
- model
- activity/privacy
- proto
- request
- response
- spring/config
- bidder
- database
- model
- metrics
- model
- retry
- server/application
- util
- algorithms/random
- dsl/config/impl
- validation
- vertx/httpclient/model
- resources
- bidder-config
- static/bidder-params
- test
- groovy/org/prebid/server/functional
- model
- bidder
- config
- pricefloors
- privacy
- request
- auction
- response
- auction
- biddersparams
- service
- testcontainers
- scaffolding
- tests
- bidder/openx
- module/responsecorrenction
- pricefloors
- privacy
- util
- privacy/gpp
- java/org/prebid/server
- activity/infrastructure
- creator
- privacy
- uscustomlogic
- usnat
- rule
- debug
- privacy
- uscustomlogic/reader
- usnat
- debug
- inner
- reader
- auction
- adjustment
- aliases
- mediatypeprocessor
- model
- privacy/enforcement
- requestfactory
- bidadjustments
- model
- bidder
- admatic
- adnuntius
- adverxo
- aidem
- alkimi
- amx
- connatix
- eplanning
- epsilon
- feedad
- invibes
- kobler
- kueezrtb
- missena
- mobkoi
- nextmillennium
- ogury
- oms
- openx
- oraki
- pangle
- playdigo
- pubmatic
- rubicon
- seedtag
- startio
- stroeercore
- thetradedesk
- unicorn
- vungle
- cache
- cookie
- floors
- geolocation
- handler
- hooks/execution
- it
- hooks
- json
- merge
- log
- metric
- orangeclickmedia
- util
- validation
- vertx/httpclient
- proto
- resources/org/prebid/server/it
- amp
- cache/update
- hooks
- reject
- sample-module
- openrtb2
- 152media
- 33across
- aax
- aceex
- acuityads
- addigi
- adelement
- adf
- adgeneration
- adhese
- adinify
- adkerneladn
- adkernel
- adman
- admaticde
- admatic
- admixer
- adnuntius
- adocean
- adoppler
- adot
- adpone
- adport
- adprime
- adquery
- adrino
- adsyield
- adtarget
- adtelligent
- adtg_org
- adtonos
- adtrgtme
- adt
- advangelists
- adverxo
- adview
- adxcg
- adyoulike
- aidem
- aja
- algorix
- alkimi
- amx
- apacdex
- appush
- artechnology
- aso
- audiencenetwork
- automatad
- avocet
- axis
- axonix
- bcmint
- beachfront
- beintoo
- bematterfull
- between
- beyondmedia
- bidagency
- bidmachine
- bidmatic
- bidmyadz
- bidscube
- bidsmind
- bidstack
- bigoad
- blasto
- bliink
- bluesea
- blue
- bmtm
- boldwin
- brave
- bwx
- cadentaperturemx
- ccx
- cointraffic
- coinzilla
- colossus
- aliases
- compass
- concert
- connatix
- connectad
- connektai
- consumable
- copper6ssp
- copper6
- cpmstar
- criteo
- cwire
- datablocks
- decenterads
- deepintent
- definemedia
- dianomi
- displayio
- dmx
- driftpixel
- dxkulture
- edge226
- embimedia
- emtv
- emxdigital
- eplanning
- epom
- epsilon
- alias
- escalax
- evolution
- feedad
- felixads
- filmzie
- finative
- flipp
- floors
- freewheelssp
- frvradn
- gamma
- gamoshi
- generic_core_functionality
- generic
- globalsun
- gothamads
- greedygame
- grid
- gumgum
- huaweiads
- banner_app_promotion_type
- banner_ch_endpoint
- banner_eu_endpoint
- banner_imei
- banner_interstitial_type
- banner_mccmnc
- banner_non_integer_mccmnc
- banner_not_app_promotion_type
- banner_ru_endpoint
- banner_with_user_geo
- banner_without_device_geo
- banner_without_userext
- banner_wrong_mccmnc
- native_include_video
- native_single_image
- native_three_image_include_icon
- native_three_image
- simple_video
- video_interstitial_type
- video_rewarded_type_no_icons_no_images
- video_rewarded_type_with_icon
- video_rewarded_type_with_images
- video_roll_type
- iionads
- imds
- impactify
- improvedigital
- indicue
- infytv
- inmobi
- insticator
- interactiveoffers
- intertech
- invibes
- iqx
- iqzone
- ix
- jambojar
- jdpmedia
- jixie
- kargo
- kayzen
- kidoz
- kiviads
- kobler
- krushmedia
- kueezrtb
- lemmaDigital
- liftoff
- limelightDigital
- lmkiviads
- lockerdome
- logan
- logicad
- loopme
- loyal
- lunamedia
- mabidder
- madvertise
- magnite
- markapp
- marsmedia
- mediago
- medianet
- melozen
- metax
- mgidx
- mgid
- minutemedia
- missena
- mobfoxpb
- mobilefuse
- mobkoi
- mobupps
- monetixads
- motorik
- multi_bid
- nextmillennium
- nobid
- ogury
- oms
- onetag
- openweb
- openx
- operaads
- oraki
- orangeclickmedia
- orbidder
- outbrain
- ownadx
- pangle
- pgamssp
- pgam
- pixad
- playdigo
- preciso
- pubmatic
- pubnative
- pubrise
- pulsepoint
- pwbid
- qt
- readpeak
- relevantdigital
- resetdigital
- revcontent
- richaudience
- rise
- roulax
- rtbhouse
- rubicon
- rxnetwork
- salunamedia
- screencore
- seedingAlliance
- seedtag
- silvermob
- silverpush
- smaato
- smartadserver
- smarthub
- smartrtb
- smartx
- smartyads
- smilewanted
- smrtconnect
- sonobi
- sovrnxsp
- sovrn
- sspbc
- startio
- storedresponse
- streamlyn
- streamvision
- stroeercore
- suntContent
- taboola
- tappx
- teads
- telaria
- tgm
- theadx
- thetradedesk
- thirtythreeacross
- tpmn
- tradplus
- trafficgate
- tredio
- tripleliftnative
- triplelift
- trustedstack
- ttx
- ucfunnel
- undertone
- unicorn
- unruly
- velonium
- vidazoo
- videobyte
- videoheroes
- vidoomy
- vimayx
- visiblemeasures
- visx
- vox
- vrtcal
- vungle
- xeworks
- xtrmqb
- yahooads
- yandex
- yeahmobi
- yearxero
- yieldlab
- yieldmo
- yieldone
- yobee
- zeroclickfraud
- zeta_global_ssp
- zmaticoo
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
1,338 files changed
+32905
-7658
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
28 | 33 | | |
29 | 34 | | |
30 | 35 | | |
| |||
50 | 55 | | |
51 | 56 | | |
52 | 57 | | |
| 58 | + | |
53 | 59 | | |
54 | 60 | | |
55 | 61 | | |
| |||
277 | 283 | | |
278 | 284 | | |
279 | 285 | | |
280 | | - | |
281 | | - | |
| 286 | + | |
| 287 | + | |
282 | 288 | | |
283 | 289 | | |
284 | 290 | | |
| |||
298 | 304 | | |
299 | 305 | | |
300 | 306 | | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
301 | 315 | | |
302 | 316 | | |
303 | 317 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| 99 | + | |
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
| |||
283 | 284 | | |
284 | 285 | | |
285 | 286 | | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
286 | 290 | | |
287 | 291 | | |
| 292 | + | |
288 | 293 | | |
289 | 294 | | |
290 | 295 | | |
| |||
294 | 299 | | |
295 | 300 | | |
296 | 301 | | |
| 302 | + | |
297 | 303 | | |
298 | 304 | | |
299 | 305 | | |
| |||
388 | 394 | | |
389 | 395 | | |
390 | 396 | | |
391 | | - | |
392 | | - | |
| 397 | + | |
| 398 | + | |
393 | 399 | | |
394 | 400 | | |
395 | 401 | | |
| |||
399 | 405 | | |
400 | 406 | | |
401 | 407 | | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
402 | 417 | | |
403 | 418 | | |
404 | 419 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
0 commit comments