Minor refactoring 1st part

prebid · Feb 8, 2022 · b044b51 · b044b51
1 parent 054c4d9
commit b044b51
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <mockito-junit-jupiter.version>4.0.0</mockito-junit-jupiter.version>
         <assertj.version>3.21.0</assertj.version>
         <wiremock.version>2.31.0</wiremock.version>
-        <awaitility.version>4.1.0</awaitility.version>
+        <awaitility.version>4.1.1</awaitility.version>
         <jetty.version>9.4.44.v20210927</jetty.version>
         <restassured.version>4.4.0</restassured.version>
         <h2.version>2.1.210</h2.version>

diff --git a/src/test/groovy/org/prebid/server/functional/model/deals/lineitem/LineItem.groovy b/src/test/groovy/org/prebid/server/functional/model/deals/lineitem/LineItem.groovy
@@ -8,7 +8,7 @@ import org.prebid.server.functional.util.PBSUtils
 import java.time.ZoneId
 import java.time.ZonedDateTime
 
-import static Status.ACTIVE
+import static LineItemStatus.ACTIVE
 import static java.time.ZoneOffset.UTC
 import static org.prebid.server.functional.model.bidder.BidderName.GENERIC
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.VERY_HIGH
@@ -43,7 +43,7 @@ class LineItem {
     @JsonFormat(pattern = TIME_PATTERN)
     ZonedDateTime updatedTimeStamp
 
-    Status status
+    LineItemStatus status
 
     List<FrequencyCap> frequencyCaps
 

diff --git a/src/test/groovy/org/prebid/server/functional/model/deals/lineitem/LineItemSize.groovy b/src/test/groovy/org/prebid/server/functional/model/deals/lineitem/LineItemSize.groovy
@@ -1,12 +1,8 @@
 package org.prebid.server.functional.model.deals.lineitem
 
-import com.fasterxml.jackson.annotation.JsonInclude
 import groovy.transform.ToString
 
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS
-
 @ToString(includeNames = true)
-@JsonInclude(content = ALWAYS)
 class LineItemSize {
 
     Integer w

diff --git a/...tional/model/deals/lineitem/Status.groovy → ...odel/deals/lineitem/LineItemStatus.groovy b/...tional/model/deals/lineitem/Status.groovy → ...odel/deals/lineitem/LineItemStatus.groovy
@@ -2,7 +2,7 @@ package org.prebid.server.functional.model.deals.lineitem
 
 import com.fasterxml.jackson.annotation.JsonValue
 
-enum Status {
+enum LineItemStatus {
 
     ACTIVE("active"),
     DELETED("deleted"),
@@ -11,7 +11,7 @@ enum Status {
     @JsonValue
     final String value
 
-    private Status(String value) {
+    private LineItemStatus(String value) {
         this.value = value
     }
 

diff --git a/...test/groovy/org/prebid/server/functional/model/deals/register/CurrencyServiceState.groovy b/...test/groovy/org/prebid/server/functional/model/deals/register/CurrencyServiceState.groovy
@@ -4,7 +4,7 @@ import groovy.transform.ToString
 
 import java.time.ZonedDateTime
 
-@ToString(includeNames = true)
+@ToString(includeNames = true, ignoreNulls = true)
 class CurrencyServiceState {
 
     ZonedDateTime lastUpdate

diff --git a/src/test/groovy/org/prebid/server/functional/model/deals/userdata/UserDetailsResponse.groovy b/src/test/groovy/org/prebid/server/functional/model/deals/userdata/UserDetailsResponse.groovy
@@ -3,7 +3,7 @@ package org.prebid.server.functional.model.deals.userdata
 import groovy.transform.ToString
 import org.prebid.server.functional.model.ResponseModel
 
-@ToString(includeNames = true)
+@ToString(includeNames = true, ignoreNulls = true)
 class UserDetailsResponse implements ResponseModel {
 
     User user

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/amp/AmpRequest.groovy b/src/test/groovy/org/prebid/server/functional/model/request/amp/AmpRequest.groovy
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.annotation.JsonNaming
 import groovy.transform.ToString
 import org.prebid.server.functional.util.PBSUtils
-import org.prebid.server.functional.util.privacy.ConsentString
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/AppExt.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/AppExt.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class AppExt {
 
     AppExtData data

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/AppExtData.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/AppExtData.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class AppExtData {
 
     String language

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/DealExt.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/DealExt.groovy
@@ -5,5 +5,5 @@ import groovy.transform.ToString
 @ToString(includeNames = true)
 class DealExt {
 
-    DealLine line
+    DealLineItem line
 }
diff --git a/...nal/model/request/auction/DealLine.groovy → ...model/request/auction/DealLineItem.groovy b/...nal/model/request/auction/DealLine.groovy → ...model/request/auction/DealLineItem.groovy
@@ -6,7 +6,7 @@ import groovy.transform.ToString
 
 @ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.LowerCaseStrategy)
-class DealLine {
+class DealLineItem {
 
     String lineItemId
     String extLineItemId

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtContext.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtContext.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class ImpExtContext {
 
     ImpExtContextData data

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtContextData.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtContextData.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class ImpExtContextData {
 
     String language

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/SiteExtData.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/SiteExtData.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class SiteExtData {
 
     String language

diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/UserExtData.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/UserExtData.groovy
@@ -1,5 +1,8 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.ToString
+
+@ToString(includeNames = true, ignoreNulls = true)
 class UserExtData {
 
     String language

diff --git a/...ovy/org/prebid/server/functional/model/request/dealsupdate/ForceDealsUpdateRequest.groovy b/...ovy/org/prebid/server/functional/model/request/dealsupdate/ForceDealsUpdateRequest.groovy
@@ -11,7 +11,7 @@ import static org.prebid.server.functional.model.request.dealsupdate.ForceDealsU
 import static org.prebid.server.functional.model.request.dealsupdate.ForceDealsUpdateRequest.Action.SEND_REPORT
 import static org.prebid.server.functional.model.request.dealsupdate.ForceDealsUpdateRequest.Action.UPDATE_LINE_ITEMS
 
-@ToString(includeNames = true)
+@ToString(includeNames = true, ignoreNulls = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy)
 class ForceDealsUpdateRequest {
 

diff --git a/src/test/groovy/org/prebid/server/functional/pg/AlertSpec.groovy b/src/test/groovy/org/prebid/server/functional/pg/AlertSpec.groovy
@@ -180,7 +180,6 @@ class AlertSpec extends BasePgSpec {
             alertRequest.source.hostId == pgPbsProperties.hostId
         }
 
-
         cleanup: "Return initial Planner response status code"
         generalPlanner.initRegisterResponse()
 

diff --git a/src/test/groovy/org/prebid/server/functional/pg/BasePgSpec.groovy b/src/test/groovy/org/prebid/server/functional/pg/BasePgSpec.groovy
@@ -3,6 +3,7 @@ package org.prebid.server.functional.pg
 import org.prebid.server.functional.model.deals.userdata.UserDetailsResponse
 import org.prebid.server.functional.model.request.dealsupdate.ForceDealsUpdateRequest
 import org.prebid.server.functional.service.PrebidServerService
+import org.prebid.server.functional.testcontainers.Dependencies
 import org.prebid.server.functional.testcontainers.PBSTest
 import org.prebid.server.functional.testcontainers.PbsContainerProperties
 import org.prebid.server.functional.testcontainers.PbsPgConfig
@@ -15,27 +16,22 @@ import org.prebid.server.functional.testcontainers.scaffolding.pg.UserData
 import org.prebid.server.functional.util.ObjectMapperWrapper
 import spock.lang.Specification
 
-import static org.prebid.server.functional.testcontainers.Dependencies.networkServiceContainer
-import static org.prebid.server.functional.testcontainers.Dependencies.objectMapperWrapper
-
 @PBSTest
 abstract class BasePgSpec extends Specification {
 
-    protected static final ObjectMapperWrapper mapper = objectMapperWrapper
-    protected static final PbsServiceFactory pbsServiceFactory = new PbsServiceFactory(networkServiceContainer, mapper)
+    protected static final ObjectMapperWrapper mapper = Dependencies.objectMapperWrapper
+    protected static final PbsServiceFactory pbsServiceFactory = new PbsServiceFactory(Dependencies.networkServiceContainer, mapper)
 
-    protected static final GeneralPlanner generalPlanner = new GeneralPlanner(networkServiceContainer, mapper).tap {
-        setResponse()
-    }
-    protected static final DeliveryStatistics deliveryStatistics = new DeliveryStatistics(networkServiceContainer, mapper)
-    protected static final Alert alert = new Alert(networkServiceContainer, mapper)
-    protected static final UserData userData = new UserData(networkServiceContainer, mapper)
+    protected static final GeneralPlanner generalPlanner = new GeneralPlanner(Dependencies.networkServiceContainer, mapper)
+    protected static final DeliveryStatistics deliveryStatistics = new DeliveryStatistics(Dependencies.networkServiceContainer, mapper)
+    protected static final Alert alert = new Alert(Dependencies.networkServiceContainer, mapper)
+    protected static final UserData userData = new UserData(Dependencies.networkServiceContainer, mapper)
 
     private static final Map<String, String> pgPbsConfig = pbsServiceFactory.generalSettings() +
-            PbsPgConfig.getPgConfig(networkServiceContainer)
+            PbsPgConfig.getPgConfig(Dependencies.networkServiceContainer)
     protected static final PrebidServerService pgPbsService = pbsServiceFactory.getService(pgPbsConfig)
     protected static final PbsContainerProperties pgPbsProperties = new PbsContainerProperties(pbsServiceFactory.getContainer(pgPbsConfig))
-    protected static final Bidder bidder = new Bidder(networkServiceContainer, mapper)
+    protected static final Bidder bidder = new Bidder(Dependencies.networkServiceContainer, mapper)
 
     def setupSpec() {
         generalPlanner.setResponse()

diff --git a/src/test/groovy/org/prebid/server/functional/pg/PgAuctionSpec.groovy b/src/test/groovy/org/prebid/server/functional/pg/PgAuctionSpec.groovy
@@ -25,13 +25,13 @@ import java.time.ZonedDateTime
 
 import static java.time.ZoneOffset.UTC
 import static org.prebid.server.functional.model.bidder.BidderName.GENERIC
+import static org.prebid.server.functional.model.deals.lineitem.LineItemStatus.DELETED
+import static org.prebid.server.functional.model.deals.lineitem.LineItemStatus.PAUSED
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.HIGH
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.LOW
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.MEDIUM
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.VERY_HIGH
 import static org.prebid.server.functional.model.deals.lineitem.RelativePriority.VERY_LOW
-import static org.prebid.server.functional.model.deals.lineitem.Status.DELETED
-import static org.prebid.server.functional.model.deals.lineitem.Status.PAUSED
 import static org.prebid.server.functional.model.deals.lineitem.targeting.MatchingFunction.IN
 import static org.prebid.server.functional.model.deals.lineitem.targeting.MatchingFunction.INTERSECTS
 import static org.prebid.server.functional.model.deals.lineitem.targeting.TargetingType.AD_UNIT_MEDIA_TYPE

diff --git a/src/test/groovy/org/prebid/server/functional/pg/PgBidderRequestSpec.groovy b/src/test/groovy/org/prebid/server/functional/pg/PgBidderRequestSpec.groovy
@@ -122,7 +122,7 @@ class PgBidderRequestSpec extends BasePgSpec {
         pgPbsService.sendForceDealsUpdateRequest(ForceDealsUpdateRequest.updateLineItemsRequest)
 
         when: "Sending auction request to PBS"
-        def auctionResponse = pgPbsService.sendAuctionRequest(bidRequest)
+        pgPbsService.sendAuctionRequest(bidRequest)
 
         then: "PBS sent a request to the bidder with two impressions"
         def bidderRequest = bidder.getBidderRequest(bidRequest.id)

diff --git a/src/test/groovy/org/prebid/server/functional/pg/PlansSpec.groovy b/src/test/groovy/org/prebid/server/functional/pg/PlansSpec.groovy
@@ -1,6 +1,5 @@
 package org.prebid.server.functional.pg
 
-
 import org.prebid.server.functional.model.mock.services.generalplanner.PlansResponse
 import org.prebid.server.functional.model.request.dealsupdate.ForceDealsUpdateRequest
 import org.prebid.server.functional.util.HttpUtil

diff --git a/...t/groovy/org/prebid/server/functional/testcontainers/scaffolding/pg/GeneralPlanner.groovy b/...t/groovy/org/prebid/server/functional/testcontainers/scaffolding/pg/GeneralPlanner.groovy
@@ -28,7 +28,9 @@ class GeneralPlanner extends NetworkScaffolding {
         setResponse(statusCode)
     }
 
-    void initPlansResponse(PlansResponse plansResponse, HttpStatusCode statusCode = OK_200, Times times = Times.exactly(1)) {
+    void initPlansResponse(PlansResponse plansResponse,
+                           HttpStatusCode statusCode = OK_200,
+                           Times times = Times.exactly(1)) {
         resetPlansEndpoint()
         setPlansResponse(plansResponse, statusCode, times)
     }
@@ -63,7 +65,9 @@ class GeneralPlanner extends NetworkScaffolding {
         getLastRecordedRequestHeaders(plansRequest)
     }
 
-    private void setPlansResponse(PlansResponse plansResponse, HttpStatusCode statusCode, Times times = Times.exactly(1)) {
+    private void setPlansResponse(PlansResponse plansResponse,
+                                  HttpStatusCode statusCode,
+                                  Times times = Times.exactly(1)) {
         setResponse(plansRequest, plansResponse, statusCode, times)
     }
 

diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
@@ -19,7 +19,6 @@ import org.prebid.server.functional.util.PBSUtils
 import org.prebid.server.functional.util.privacy.CcpaConsent
 
 import static org.prebid.server.functional.model.bidder.BidderName.APPNEXUS
-import static org.prebid.server.functional.model.response.auction.ErrorType.PREBID
 import static org.prebid.server.functional.util.privacy.CcpaConsent.Signal.ENFORCED
 
 @PBSTest

diff --git a/src/test/groovy/org/prebid/server/functional/tests/HttpSettingsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/HttpSettingsSpec.groovy
@@ -1,12 +1,12 @@
 package org.prebid.server.functional.tests
 
+import org.prebid.server.functional.model.UidsCookie
 import org.prebid.server.functional.model.db.StoredRequest
 import org.prebid.server.functional.model.mock.services.httpsettings.HttpAccountsResponse
 import org.prebid.server.functional.model.request.amp.AmpRequest
 import org.prebid.server.functional.model.request.auction.BidRequest
 import org.prebid.server.functional.model.request.event.EventRequest
 import org.prebid.server.functional.model.request.setuid.SetuidRequest
-import org.prebid.server.functional.model.UidsCookie
 import org.prebid.server.functional.model.request.vtrack.VtrackRequest
 import org.prebid.server.functional.model.request.vtrack.xml.Vast
 import org.prebid.server.functional.service.PrebidServerException
@@ -120,7 +120,8 @@ class HttpSettingsSpec extends BaseSpec {
         assert response.uidsCookie.bday
         assert !response.uidsCookie.tempUIDs
         assert !response.uidsCookie.uids
-        assert response.responseBody == ResourceUtil.readByteArrayFromClassPath("org/prebid/server/functional/tracking-pixel.png")
+        assert response.responseBody ==
+                ResourceUtil.readByteArrayFromClassPath("org/prebid/server/functional/tracking-pixel.png")
 
         and: "There should be only one account request"
         assert httpSettings.getRequestCount(request.account) == 1

diff --git a/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/SmokeSpec.groovy
@@ -1,5 +1,6 @@
 package org.prebid.server.functional.tests
 
+import org.prebid.server.functional.model.UidsCookie
 import org.prebid.server.functional.model.db.Account
 import org.prebid.server.functional.model.db.StoredRequest
 import org.prebid.server.functional.model.request.amp.AmpRequest
@@ -8,7 +9,6 @@ import org.prebid.server.functional.model.request.cookiesync.CookieSyncRequest
 import org.prebid.server.functional.model.request.event.EventRequest
 import org.prebid.server.functional.model.request.logging.httpinteraction.HttpInteractionRequest
 import org.prebid.server.functional.model.request.setuid.SetuidRequest
-import org.prebid.server.functional.model.UidsCookie
 import org.prebid.server.functional.model.request.vtrack.VtrackRequest
 import org.prebid.server.functional.model.request.vtrack.xml.Vast
 import org.prebid.server.functional.model.response.cookiesync.CookieSyncResponse
-Original file line number
+Diff line change
@@ Expand Up / @@ -180,7 +180,6 @@ class AlertSpec extends BasePgSpec { @@
                 alertRequest.source.hostId == pgPbsProperties.hostId
             }
             cleanup: "Return initial Planner response status code"
             generalPlanner.initRegisterResponse()
@@ Expand Down @@