feat(unification): replace internal references to interface #370

prebid · Mar 4, 2022 · a73b9ef · a73b9ef
1 parent 318088e
commit a73b9ef
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
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
@@ -26,6 +26,7 @@
 import org.prebid.mobile.tasksmanager.TasksManager;
 import org.prebid.mobile.unification.AdUnitConfiguration;
 import org.prebid.mobile.unification.BaseAdUnitConfiguration;
+import org.prebid.mobile.unification.BaseAdUnitConfigurationInterface;
 
 import java.util.*;
 
@@ -35,7 +36,7 @@ public abstract class AdUnit {
 
     private int periodMillis = 0; // No auto refresh
     private DemandFetcher fetcher;
-    protected BaseAdUnitConfiguration configuration = createConfiguration();
+    protected BaseAdUnitConfigurationInterface configuration = createConfiguration();
 
     AdUnit(@NonNull String configId, @NonNull AdType adType) {
         configuration.setConfigId(configId);

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/DemandAdapter.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/DemandAdapter.java
@@ -17,7 +17,7 @@
 package org.prebid.mobile;
 
 import androidx.annotation.MainThread;
-import org.prebid.mobile.unification.BaseAdUnitConfiguration;
+import org.prebid.mobile.unification.BaseAdUnitConfigurationInterface;
 
 import java.util.HashMap;
 
@@ -40,7 +40,7 @@ interface DemandAdapter {
      * @param auctionId an unique identifier
      */
 
-    void requestDemand(BaseAdUnitConfiguration configuration, DemandAdapterListener listener, String auctionId);
+    void requestDemand(BaseAdUnitConfigurationInterface configuration, DemandAdapterListener listener, String auctionId);
 
     void stopRequest(String auctionId);
 

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/DemandFetcher.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/DemandFetcher.java
@@ -22,7 +22,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import org.prebid.mobile.tasksmanager.TasksManager;
-import org.prebid.mobile.unification.BaseAdUnitConfiguration;
+import org.prebid.mobile.unification.BaseAdUnitConfigurationInterface;
 
 import java.util.HashMap;
 import java.util.UUID;
@@ -43,7 +43,7 @@ enum STATE {
     private RequestRunnable requestRunnable;
     private long lastFetchTime = -1;
     private long timePausedAt = -1;
-    private BaseAdUnitConfiguration configuration;
+    private BaseAdUnitConfigurationInterface configuration;
 
     DemandFetcher(@NonNull Object adObj) {
         this.state = STATE.STOPPED;
@@ -59,7 +59,7 @@ void setListener(OnCompleteListener listener) {
         this.listener = listener;
     }
 
-    void setConfiguration(BaseAdUnitConfiguration configuration) {
+    void setConfiguration(BaseAdUnitConfigurationInterface configuration) {
         this.configuration = configuration;
     }
 

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/PrebidServerAdapter.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/PrebidServerAdapter.java
@@ -37,7 +37,7 @@
 import org.prebid.mobile.http.NoContextException;
 import org.prebid.mobile.http.TaskResult;
 import org.prebid.mobile.tasksmanager.TasksManager;
-import org.prebid.mobile.unification.BaseAdUnitConfiguration;
+import org.prebid.mobile.unification.BaseAdUnitConfigurationInterface;
 import org.prebid.mobile.unification.NativeAdUnitConfiguration;
 
 import java.lang.ref.WeakReference;
@@ -53,7 +53,7 @@ class PrebidServerAdapter implements DemandAdapter {
     }
 
     @Override
-    public void requestDemand(BaseAdUnitConfiguration configuration, DemandAdapterListener listener, String auctionId) {
+    public void requestDemand(BaseAdUnitConfigurationInterface configuration, DemandAdapterListener listener, String auctionId) {
         final ServerConnector connector = new ServerConnector(this, listener, configuration, auctionId, cacheIdSaver);
         serverConnectors.add(connector);
         connector.execute();
@@ -78,7 +78,7 @@ static class ServerConnector extends HTTPPost {
         private final WeakReference<PrebidServerAdapter> prebidServerAdapter;
         private final TimeoutCountDownTimer timeoutCountDownTimer;
 
-        private final BaseAdUnitConfiguration configuration;
+        private final BaseAdUnitConfigurationInterface configuration;
         private final String auctionId;
 
         private DemandAdapterListener listener;
@@ -90,7 +90,7 @@ static class ServerConnector extends HTTPPost {
 
         private CacheIdSaver cacheIdSaver;
 
-        ServerConnector(PrebidServerAdapter prebidServerAdapter, DemandAdapterListener listener, BaseAdUnitConfiguration configuration, String auctionId, CacheIdSaver cacheIdSaver) {
+        ServerConnector(PrebidServerAdapter prebidServerAdapter, DemandAdapterListener listener, BaseAdUnitConfigurationInterface configuration, String auctionId, CacheIdSaver cacheIdSaver) {
             this.prebidServerAdapter = new WeakReference<>(prebidServerAdapter);
             this.listener = listener;
             this.configuration = configuration;

diff --git a/...rebidMobile-core/src/main/java/org/prebid/mobile/unification/BaseAdUnitConfiguration.java b/...rebidMobile-core/src/main/java/org/prebid/mobile/unification/BaseAdUnitConfiguration.java
@@ -139,13 +139,15 @@ public void clearContextKeywords() {
         contextKeywordsSet.clear();
     }
 
+    @Override
     public AdUnitConfiguration castToOriginal() {
         if (this instanceof AdUnitConfiguration) {
             return (AdUnitConfiguration) this;
         }
         throw new IllegalStateException("Can't cast to AdUnitConfiguration.");
     }
 
+    @Override
     public NativeAdUnitConfiguration castToNative() {
         if (this instanceof NativeAdUnitConfiguration) {
             return (NativeAdUnitConfiguration) this;

diff --git a/...le-core/src/main/java/org/prebid/mobile/unification/BaseAdUnitConfigurationInterface.java b/...le-core/src/main/java/org/prebid/mobile/unification/BaseAdUnitConfigurationInterface.java
@@ -58,4 +58,9 @@ public abstract interface BaseAdUnitConfigurationInterface {
 
     public void clearContextKeywords();
 
+
+    public AdUnitConfiguration castToOriginal();
+
+    public NativeAdUnitConfiguration castToNative();
+
 }