Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
20 changes: 0 additions & 20 deletions adapters/adoppler/adoppler_test.go

This file was deleted.

81 changes: 0 additions & 81 deletions adapters/adoppler/adopplertest/exemplary/custom-client.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package adoppler
package elementaltv

import (
"encoding/json"
Expand All @@ -17,12 +17,10 @@ import (
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

const DefaultClient = "app"

var bidHeaders http.Header = map[string][]string{
"Accept": {"application/json"},
"Content-Type": {"application/json;charset=utf-8"},
"X-OpenRTB-Version": {"2.5"},
"X-OpenRTB-Version": {"2.6"},
}

type adsVideoExt struct {
Expand All @@ -33,24 +31,24 @@ type adsImpExt struct {
Video *adsVideoExt `json:"video"`
}

type AdopplerAdapter struct {
type adapter struct {
endpoint *template.Template
}

// Builder builds a new instance of the Adoppler adapter for the given bidder with the given config.
// Builder builds a new instance of the ElementalTv adapter for the given bidder with the given config.
func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) {
template, err := template.New("endpointTemplate").Parse(config.Endpoint)
if err != nil {
return nil, fmt.Errorf("unable to parse endpoint url template: %v", err)
}

bidder := &AdopplerAdapter{
bidder := &adapter{
endpoint: template,
}
return bidder, nil
}

func (ads *AdopplerAdapter) MakeRequests(
func (ads *adapter) MakeRequests(
req *openrtb2.BidRequest,
info *adapters.ExtraRequestInfo,
) (
Expand Down Expand Up @@ -100,7 +98,7 @@ func (ads *AdopplerAdapter) MakeRequests(
return datas, errs
}

func (ads *AdopplerAdapter) MakeBids(
func (ads *adapter) MakeBids(
intReq *openrtb2.BidRequest,
extReq *adapters.RequestData,
resp *adapters.ResponseData,
Expand Down Expand Up @@ -193,33 +191,27 @@ func (ads *AdopplerAdapter) MakeBids(
return adsResp, nil
}

func (ads *AdopplerAdapter) bidUri(ext *openrtb_ext.ExtImpAdoppler) (string, error) {
func (ads *adapter) bidUri(ext *openrtb_ext.ExtImpElementalTv) (string, error) {
params := macros.EndpointTemplateParams{}
params.AdUnit = url.PathEscape(ext.AdUnit)
if ext.Client == "" {
params.AccountID = DefaultClient
} else {
params.AccountID = url.PathEscape(ext.Client)
}

return macros.ResolveMacros(ads.endpoint, params)
}

func unmarshalExt(ext json.RawMessage) (*openrtb_ext.ExtImpAdoppler, error) {
func unmarshalExt(ext json.RawMessage) (*openrtb_ext.ExtImpElementalTv, error) {
var bext adapters.ExtImpBidder
err := jsonutil.Unmarshal(ext, &bext)
if err != nil {
return nil, err
}

var adsExt openrtb_ext.ExtImpAdoppler
var adsExt openrtb_ext.ExtImpElementalTv
err = jsonutil.Unmarshal(bext.Bidder, &adsExt)
if err != nil {
return nil, err
}

if adsExt.AdUnit == "" {
return nil, errors.New("$.imp.ext.adoppler.adunit required")
return nil, errors.New("$.imp.ext.bidder.adunit required")
}

return &adsExt, nil
Expand Down
20 changes: 20 additions & 0 deletions adapters/elementaltv/elementaltv_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package elementaltv

import (
"testing"

"github.com/prebid/prebid-server/v3/adapters/adapterstest"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

func TestJsonSamples(t *testing.T) {
bidder, buildErr := Builder(openrtb_ext.BidderElementalTv, config.Adapter{
Endpoint: "https://pbs.elementaltv.io/processHeaderBid/{{.AdUnit}}"}, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"})

if buildErr != nil {
t.Fatalf("Builder returned unexpected error %v", buildErr)
}

adapterstest.RunJSONBidderTest(t, "elementaltvtest", bidder)
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down Expand Up @@ -86,7 +86,7 @@
},
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit2",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit2",
"body":{
"id":"req1-unit2",
"imp":[
Expand Down Expand Up @@ -141,7 +141,7 @@
},
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit3",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit3",
"body":{
"id":"req1-unit3",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down Expand Up @@ -73,7 +73,7 @@
},
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit2",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit2",
"body":{
"id":"req1-unit2",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down Expand Up @@ -86,7 +86,7 @@
},
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit2",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit2",
"body":{
"id":"req1-unit2",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"expectedMakeRequestsErrors":[
{
"value":"$.imp.ext.adoppler.adunit required",
"value":"$.imp.ext.bidder.adunit required",
"comparison":"literal"
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"httpCalls":[
{
"expectedRequest":{
"uri":"http://app.trustedmarketplace.com/processHeaderBid/unit1",
"uri":"https://pbs.elementaltv.io/processHeaderBid/unit1",
"body":{
"id":"req1-unit1",
"imp":[
Expand Down
4 changes: 2 additions & 2 deletions exchange/adapter_builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/prebid/prebid-server/v3/adapters/admixer"
"github.com/prebid/prebid-server/v3/adapters/adnuntius"
"github.com/prebid/prebid-server/v3/adapters/adocean"
"github.com/prebid/prebid-server/v3/adapters/adoppler"
"github.com/prebid/prebid-server/v3/adapters/adot"
"github.com/prebid/prebid-server/v3/adapters/adpone"
"github.com/prebid/prebid-server/v3/adapters/adprime"
Expand Down Expand Up @@ -102,6 +101,7 @@ import (
"github.com/prebid/prebid-server/v3/adapters/dxkulture"
evolution "github.com/prebid/prebid-server/v3/adapters/e_volution"
"github.com/prebid/prebid-server/v3/adapters/edge226"
"github.com/prebid/prebid-server/v3/adapters/elementaltv"
"github.com/prebid/prebid-server/v3/adapters/emtv"
"github.com/prebid/prebid-server/v3/adapters/eplanning"
"github.com/prebid/prebid-server/v3/adapters/epom"
Expand Down Expand Up @@ -288,7 +288,6 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
openrtb_ext.BidderAdmixer: admixer.Builder,
openrtb_ext.BidderAdnuntius: adnuntius.Builder,
openrtb_ext.BidderAdOcean: adocean.Builder,
openrtb_ext.BidderAdoppler: adoppler.Builder,
openrtb_ext.BidderAdot: adot.Builder,
openrtb_ext.BidderAdpone: adpone.Builder,
openrtb_ext.BidderAdprime: adprime.Builder,
Expand Down Expand Up @@ -371,6 +370,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
openrtb_ext.BidderDmx: dmx.Builder,
openrtb_ext.BidderDXKulture: dxkulture.Builder,
openrtb_ext.BidderDriftPixel: driftpixel.Builder,
openrtb_ext.BidderElemantalTv: elementaltv.Builder,
openrtb_ext.BidderEmtv: emtv.Builder,
openrtb_ext.BidderEmxDigital: cadentaperturemx.Builder,
openrtb_ext.BidderEPlanning: eplanning.Builder,
Expand Down
Loading
Loading