fix: some corrections and renames #688

prebid · Sep 26, 2023 · deec265 · deec265
1 parent 40dd04a
commit deec265
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/...bile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java b/...bile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java
@@ -77,7 +77,7 @@ private void createAd() {
         prebidRequest.setNativeParameters(creativeNativeParameters());
 
         AdManagerAdRequest gamRequest = new AdManagerAdRequest.Builder().build();
-        prebidAdUnit.fetchDemand(prebidRequest, gamRequest, bidInfo -> {
+        prebidAdUnit.fetchDemand(gamRequest, prebidRequest, bidInfo -> {
             loadGam(gamRequest);
         });
     }

diff --git a/...lindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt b/...lindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt
@@ -61,7 +61,7 @@ class GamOriginalApiMultiformatBannerVideoNativeActivity : BaseAdActivity() {
         prebidRequest.setNativeParameters(createNativeParameters())
 
         val gamRequest = AdManagerAdRequest.Builder().build()
-        prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) {
+        prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) {
             loadGam(gamRequest)
         }
     }

diff --git a/...gtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt b/...gtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt
@@ -103,7 +103,7 @@ open class GamOriginalMultiformatBannerVideoNativeFragment : AdFragment() {
         prebidAdUnit = PrebidAdUnit(configId)
 
         val gamRequest = AdManagerAdRequest.Builder().build()
-        prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) {
+        prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) {
             loadGam(gamRequest)
         }
     }

diff --git a/...pp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt b/...pp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt
@@ -89,7 +89,7 @@ open class GamOriginalMultiformatBannerVideoNativeStylesFragment : AdFragment()
         prebidAdUnit = PrebidAdUnit(configId)
 
         val gamRequest = AdManagerAdRequest.Builder().build()
-        prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) {
+        prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) {
             loadGam(gamRequest)
         }
     }

diff --git a/...deringtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt b/...deringtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt
@@ -62,7 +62,7 @@ open class GamOriginalMultiformatInterstitialFragment : BaseBidInterstitialFragm
         prebidAdUnit = PrebidAdUnit(getCurrentConfigId())
 
         val gamRequest = AdManagerAdRequest.Builder().build()
-        prebidAdUnit?.fetchDemand(createPrebidRequest(), gamRequest) {
+        prebidAdUnit?.fetchDemand(gamRequest, createPrebidRequest()) {
             AdManagerInterstitialAd.load(
                 requireContext(),
                 adUnitId,

diff --git a/.../renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt b/.../renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt
@@ -57,7 +57,7 @@ open class GamOriginalMultiformatRewardedFragment : BaseBidInterstitialFragment(
         prebidAdUnit = PrebidAdUnit(configId)
 
         val gamRequest = AdManagerAdRequest.Builder().build()
-        prebidAdUnit?.fetchDemand(createPrebidRequest(), gamRequest) {
+        prebidAdUnit?.fetchDemand(gamRequest, createPrebidRequest()) {
             RewardedAd.load(
                 requireContext(),
                 adUnitId,

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java
@@ -124,7 +124,7 @@ public void fetchDemand(@NonNull final OnCompleteListener2 listener) {
         });
     }
 
-    public void fetchDemand(@Nullable Object adObj, @NonNull OnCompleteListener listener) {
+    public void fetchDemand(Object adObj, @NonNull OnCompleteListener listener) {
         if (TextUtils.isEmpty(PrebidMobile.getPrebidServerAccountId())) {
             LogUtil.error("Empty account id.");
             listener.onComplete(ResultCode.INVALID_ACCOUNT_ID);

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java
@@ -16,7 +16,7 @@ public class BidInfo {
     @Nullable
     private String nativeCacheId;
     @Nullable
-    private Integer expirationTimeSeconds;
+    private Integer exp;
 
     public BidInfo(
             @NonNull ResultCode resultCode,
@@ -31,7 +31,7 @@ public void setNativeResult(
             Integer expirationTimeSeconds
     ) {
         this.nativeCacheId = nativeCacheId;
-        this.expirationTimeSeconds = expirationTimeSeconds;
+        this.exp = expirationTimeSeconds;
     }
 
     @NonNull
@@ -50,8 +50,8 @@ public String getNativeCacheId() {
     }
 
     @Nullable
-    public Integer getExpirationTimeSeconds() {
-        return expirationTimeSeconds;
+    public Integer getExp() {
+        return exp;
     }
 
 }
diff --git a/...idMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java b/...idMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java
@@ -30,8 +30,8 @@ public void fetchDemand(
     }
 
     public void fetchDemand(
-            PrebidRequest request,
             Object adObject,
+            PrebidRequest request,
             OnFetchDemandResult listener
     ) {
         baseFetchDemand(request, adObject, listener);

diff --git a/...dMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java b/...dMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java
@@ -64,7 +64,7 @@ public void emptyBidResponse() {
         assertNotNull(bidInfo);
         assertEquals(ResultCode.NO_BIDS, bidInfo.getResultCode());
         assertNull(bidInfo.getNativeCacheId());
-        assertNull(bidInfo.getExpirationTimeSeconds());
+        assertNull(bidInfo.getExp());
         assertNull(bidInfo.getTargetingKeywords());
     }
 
@@ -93,7 +93,7 @@ public void fullBidResponse() {
         assertEquals(ResultCode.SUCCESS, bidInfo.getResultCode());
         assertEquals(keywords, bidInfo.getTargetingKeywords());
         assertNull(bidInfo.getNativeCacheId());
-        assertNull(bidInfo.getExpirationTimeSeconds());
+        assertNull(bidInfo.getExp());
     }
 
     @Test
@@ -122,7 +122,7 @@ public void fullBidResponseWithNative() {
         assertNotNull(bidInfo);
         assertEquals(ResultCode.SUCCESS, bidInfo.getResultCode());
         assertEquals(keywords, bidInfo.getTargetingKeywords());
-        assertEquals(Integer.valueOf(300), bidInfo.getExpirationTimeSeconds());
+        assertEquals(Integer.valueOf(300), bidInfo.getExp());
     }
 
 }