Update after review

Author: marki1an

src/test/groovy/org/prebid/server/functional/model/request/auction/SiteExt.groovy

@@ -1,29 +1,22 @@
 package org.prebid.server.functional.model.request.auction
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
 import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
 class SiteExt {
 
-    Amp amp
+    @JsonProperty("amp")
+    Boolean isAmp
     SiteExtData data
 
     static SiteExt getFPDSiteExt() {
         new SiteExt(data: SiteExtData.FPDSiteExtData)
     }
 
-    @ToString(includeNames = true, ignoreNulls = true)
-    enum Amp {
-
-        FROM_AMP(1),
-        NOT_FROM_AMP(0)
-
-        @JsonValue
-        final int code
-
-        Amp(Integer code) {
-            this.code == code
-        }
+    @JsonValue
+    Integer getAmp() {
+        isAmp ? 1 : 0
     }
 }

src/test/groovy/org/prebid/server/functional/tests/BidderFieldDisplayBehaviorSpec.groovy

@@ -60,6 +60,7 @@ import static org.prebid.server.functional.model.request.auction.DistributionCha
 import static org.prebid.server.functional.model.request.auction.DistributionChannel.SITE
 import static org.prebid.server.functional.model.request.auction.TraceLevel.BASIC
 import static org.prebid.server.functional.util.PBSUtils.getRandomDecimal
+import static org.prebid.server.functional.util.PBSUtils.getRandomBoolean
 
 class BidderFieldDisplayBehaviorSpec extends BaseSpec {
 
@@ -68,10 +69,9 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec {
     def "PBS should pass ext.prebid.createTids to bidder request"() {
         given: "Default bid request"
         def bidRequest = BidRequest.defaultBidRequest.tap {
-            ext.prebid.createTids = PBSUtils.randomBoolean
+            ext.prebid.createTids = randomBoolean
         }
 
-
         when: "PBS processes auction request"
         defaultPbsService.sendAuctionRequest(bidRequest)
 
@@ -139,7 +139,7 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec {
     def "PBS should pass supportDeals to bidder request when supportDeals specified"() {
         given: "Default bid request"
         def bidRequest = BidRequest.defaultBidRequest.tap {
-            ext.prebid.supportDeals = PBSUtils.randomBoolean
+            ext.prebid.supportDeals = randomBoolean
         }
 
         when: "PBS processes auction request"
@@ -153,7 +153,7 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec {
     def "PBS shouldn't pass ext.prebid.cache to bidder request when cache specified"() {
         given: "Default bid request"
         def bidRequest = BidRequest.defaultBidRequest.tap {
-            ext.prebid.cache = new PrebidCache(winningOnly: PBSUtils.randomBoolean)
+            ext.prebid.cache = new PrebidCache(winningOnly: randomBoolean)
         }
 
         when: "PBS processes auction request"
@@ -186,7 +186,7 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec {
         given: "Default bid request"
         def bidRequest = BidRequest.defaultBidRequest.tap {
             ext.prebid.currency = new PrebidCurrency(
-                    usePbsRates: PBSUtils.randomBoolean,
+                    usePbsRates: randomBoolean,
                     rates: getDefaultConversionRates())
         }
 
@@ -403,7 +403,7 @@ class BidderFieldDisplayBehaviorSpec extends BaseSpec {
     def "PBS should pass site.ext to bidder request when site.ext specified"() {
         given: "Default basic BidRequest with generic bidder"
         def bidRequest = BidRequest.defaultBidRequest.tap {
-            site.ext = new SiteExt(amp: PBSUtils.getRandomEnum(SiteExt.Amp), data: new SiteExtData(id: PBSUtils.randomString))
+            site.ext = new SiteExt(isAmp: PBSUtils.randomBoolean, data: new SiteExtData(id: PBSUtils.randomString))
         }
 
         when: "PBS processes auction request"