Skip to content

Commit

Permalink
feat: replace AdUnitIdentifierType to AdFormat #393
Browse files Browse the repository at this point in the history
  • Loading branch information
ValentinPostindustria committed Mar 24, 2022
1 parent 7abd151 commit c64ae8b
Show file tree
Hide file tree
Showing 44 changed files with 147 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void requestBannerAd(
}

AdUnitConfiguration adConfiguration = new AdUnitConfiguration();
adConfiguration.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.BANNER);
adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER);
DisplayViewListener listener = getListener(adMobListener);
adView = new DisplayView(
context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.prebid.mobile.rendering.bidding.loader.BidLoader;
import org.prebid.mobile.rendering.errors.AdException;
import org.prebid.mobile.tasksmanager.TasksManager;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import java.util.*;
Expand All @@ -47,7 +48,7 @@ public abstract class AdUnit {
@Nullable
protected Object adObject;

AdUnit(@NonNull String configId, @NonNull AdUnitConfiguration.AdUnitIdentifierType adType) {
AdUnit(@NonNull String configId, @NonNull AdFormat adType) {
configuration.setConfigId(configId);
configuration.setAdUnitIdentifierType(adType);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
package org.prebid.mobile;

import androidx.annotation.NonNull;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

import java.util.HashSet;

public class BannerAdUnit extends BannerBaseAdUnit {

public BannerAdUnit(@NonNull String configId, int width, int height) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.BANNER);
super(configId, AdFormat.BANNER);
configuration.addSize(new AdSize(width, height));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

import java.util.List;

public abstract class BannerBaseAdUnit extends AdUnit {

BannerBaseAdUnit(@NonNull String configId, @NonNull AdUnitConfiguration.AdUnitIdentifierType adType) {
BannerBaseAdUnit(@NonNull String configId, @NonNull AdFormat adType) {
super(configId, adType);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class InterstitialAdUnit extends BannerBaseAdUnit {

public InterstitialAdUnit(@NonNull String configId) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
super(configId, AdFormat.INTERSTITIAL);
configuration.setAdPosition(AdPosition.FULLSCREEN);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.prebid.mobile.rendering.bidding.data.bid.BidResponse;
import org.prebid.mobile.rendering.bidding.listeners.BidRequesterListener;
import org.prebid.mobile.rendering.errors.AdException;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.NativeAdUnitConfiguration;

import java.util.HashMap;
Expand All @@ -22,7 +22,7 @@ public class NativeAdUnit extends AdUnit {
private final NativeAdUnitConfiguration nativeConfiguration;

public NativeAdUnit(@NonNull String configId) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.NATIVE);
super(configId, AdFormat.NATIVE);
nativeConfiguration = configuration.getNativeConfiguration();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import androidx.annotation.NonNull;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class RewardedVideoAdUnit extends VideoBaseAdUnit {

public RewardedVideoAdUnit(@NonNull String configId) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.VAST);
super(configId, AdFormat.VAST);
configuration.setRewarded(true);
configuration.setAdPosition(AdPosition.FULLSCREEN);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
package org.prebid.mobile;

import androidx.annotation.NonNull;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

import java.util.HashSet;

public class VideoAdUnit extends VideoBaseAdUnit {

public VideoAdUnit(@NonNull String configId, int width, int height) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.VAST);
super(configId, AdFormat.VAST);
configuration.addSize(new AdSize(width, height));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

import java.util.List;

public abstract class VideoBaseAdUnit extends AdUnit {

VideoBaseAdUnit(@NonNull String configId, @NonNull AdUnitConfiguration.AdUnitIdentifierType adType) {
VideoBaseAdUnit(@NonNull String configId, @NonNull AdFormat adType) {
super(configId, adType);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import androidx.annotation.NonNull;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class VideoInterstitialAdUnit extends VideoBaseAdUnit {

public VideoInterstitialAdUnit(@NonNull String configId) {
super(configId, AdUnitConfiguration.AdUnitIdentifierType.VAST);
super(configId, AdFormat.VAST);
configuration.setAdPosition(AdPosition.FULLSCREEN);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@
import org.prebid.mobile.rendering.errors.AdException;
import org.prebid.mobile.rendering.models.AdDetails;
import org.prebid.mobile.rendering.networking.WinNotifier;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

public class InterstitialController {
private static final String TAG = InterstitialController.class.getSimpleName();

private final InterstitialView mBidInterstitialView;
private final InterstitialControllerListener mListener;
private AdUnitConfiguration.AdUnitIdentifierType mAdUnitIdentifierType;
private AdFormat mAdUnitIdentifierType;

private final InterstitialViewListener mInterstitialViewListener = new InterstitialViewListener() {
@Override
Expand Down Expand Up @@ -96,8 +97,8 @@ public void loadAd(AdUnitConfiguration adUnitConfiguration, BidResponse bidRespo
WinNotifier winNotifier = new WinNotifier();
winNotifier.notifyWin(bidResponse, () -> {
mAdUnitIdentifierType = bidResponse.isVideo()
? AdUnitConfiguration.AdUnitIdentifierType.VAST
: AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL;
? AdFormat.VAST
: AdFormat.INTERSTITIAL;
adUnitConfiguration.setAdUnitIdentifierType(mAdUnitIdentifierType);
mBidInterstitialView.loadAd(adUnitConfiguration, bidResponse);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.prebid.mobile.rendering.bidding.listeners.OnFetchCompleteListener;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.rendering.utils.broadcast.ScreenStateReceiver;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class MediationBannerAdUnit extends MediationBaseAdUnit {
private static final String TAG = MediationBannerAdUnit.class.getSimpleName();
Expand All @@ -42,7 +42,7 @@ public MediationBannerAdUnit(Context context, String configId, AdSize size, Preb
protected final void initAdConfig(String configId, AdSize adSize) {
mAdUnitConfig.addSize(adSize);
mAdUnitConfig.setConfigId(configId);
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.BANNER);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.BANNER);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat;
import org.prebid.mobile.rendering.bidding.listeners.OnFetchCompleteListener;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class MediationInterstitialAdUnit extends MediationBaseAdUnit {
private static final String TAG = MediationInterstitialAdUnit.class.getSimpleName();
Expand Down Expand Up @@ -56,17 +56,17 @@ public final void fetchDemand(
protected final void initAdConfig(String configId, AdSize minSizePercentage) {
mAdUnitConfig.setMinSizePercentage(minSizePercentage);
mAdUnitConfig.setConfigId(configId);
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.INTERSTITIAL);
mAdUnitConfig.setAdPosition(AdPosition.FULLSCREEN);
}

private void setAdUnitType(AdUnitFormat adUnitFormat) {
switch (adUnitFormat) {
case DISPLAY:
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.INTERSTITIAL);
break;
case VIDEO:
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.VAST);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST);
break;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.prebid.mobile.rendering.bidding.data.bid.BidResponse;
import org.prebid.mobile.rendering.bidding.listeners.OnFetchCompleteListener;
import org.prebid.mobile.rendering.models.AdPosition;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

public class MediationRewardedVideoAdUnit extends MediationBaseAdUnit {

Expand All @@ -41,7 +41,7 @@ public void fetchDemand(@NonNull OnFetchCompleteListener listener) {
@Override
protected final void initAdConfig(String configId, AdSize adSize) {
mAdUnitConfig.setConfigId(configId);
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.VAST);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST);
mAdUnitConfig.setRewarded(true);
mAdUnitConfig.setAdPosition(AdPosition.FULLSCREEN);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.prebid.mobile.rendering.networking.modelcontrollers.BidRequester;
import org.prebid.mobile.rendering.networking.parameters.AdRequestInput;
import org.prebid.mobile.rendering.utils.helpers.RefreshTimerTask;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import java.lang.ref.WeakReference;
Expand Down Expand Up @@ -139,7 +140,7 @@ public void setupRefreshTimer() {
LogUtil.debug(TAG, "Schedule refresh timer");

boolean isRefreshAvailable = mAdConfiguration != null
&& mAdConfiguration.isAdType(AdUnitConfiguration.AdUnitIdentifierType.BANNER);
&& mAdConfiguration.isAdType(AdFormat.BANNER);
if (!isRefreshAvailable) {
LogUtil.debug(TAG, "setupRefreshTimer: Canceled. AdConfiguration is null or AdType is not Banner");
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.prebid.mobile.rendering.utils.broadcast.ScreenStateReceiver;
import org.prebid.mobile.rendering.utils.helpers.VisibilityChecker;
import org.prebid.mobile.rendering.views.webview.mraid.Views;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import java.util.Map;
Expand Down Expand Up @@ -273,7 +274,7 @@ public void destroy() {

//region ==================== getters and setters
public void setAutoRefreshDelay(int seconds) {
if (!mAdUnitConfig.isAdType(AdUnitConfiguration.AdUnitIdentifierType.BANNER)) {
if (!mAdUnitConfig.isAdType(AdFormat.BANNER)) {
LogUtil.info(TAG, "Autorefresh is available only for Banner ad type");
return;
}
Expand Down Expand Up @@ -301,7 +302,7 @@ public void setBannerListener(BannerViewListener bannerListener) {
}

public void setVideoPlacementType(VideoPlacementType videoPlacement) {
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.VAST);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST);

final PlacementType placementType = VideoPlacementType.mapToPlacementType(videoPlacement);
mAdUnitConfig.setPlacementType(placementType);
Expand Down Expand Up @@ -437,7 +438,7 @@ private void initAdConfiguration() {
mAdUnitConfig.setConfigId(mConfigId);
mAdUnitConfig.setAutoRefreshDelay(mRefreshIntervalSec);
mEventHandler.setBannerEventListener(mBannerEventListener);
mAdUnitConfig.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.BANNER);
mAdUnitConfig.setAdUnitIdentifierType(AdFormat.BANNER);
mAdUnitConfig.addSizes(mEventHandler.getAdSizeArray());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.prebid.mobile.rendering.bidding.listeners.InterstitialAdUnitListener;
import org.prebid.mobile.rendering.bidding.listeners.InterstitialEventListener;
import org.prebid.mobile.rendering.errors.AdException;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD;
Expand Down Expand Up @@ -195,12 +196,12 @@ void notifyErrorListener(AdException exception) {
}
}

private AdUnitConfiguration.AdUnitIdentifierType mapPrebidAdUnitTypeToAdConfigAdUnitType(AdUnitFormat adUnitFormat) {
private AdFormat mapPrebidAdUnitTypeToAdConfigAdUnitType(AdUnitFormat adUnitFormat) {
switch (adUnitFormat) {
case DISPLAY:
return AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL;
return AdFormat.INTERSTITIAL;
case VIDEO:
return AdUnitConfiguration.AdUnitIdentifierType.VAST;
return AdFormat.VAST;
default:
LogUtil.debug(TAG, "setAdUnitIdentifierType: Provided AdUnitType [" + adUnitFormat + "] doesn't match any expected adUnitType.");
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.prebid.mobile.rendering.bidding.listeners.RewardedAdUnitListener;
import org.prebid.mobile.rendering.bidding.listeners.RewardedVideoEventListener;
import org.prebid.mobile.rendering.errors.AdException;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD;
Expand Down Expand Up @@ -105,7 +106,7 @@ public RewardedAdUnit(Context context, String configId, RewardedEventHandler eve

AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration();
adUnitConfiguration.setConfigId(configId);
adUnitConfiguration.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.VAST);
adUnitConfiguration.setAdUnitIdentifierType(AdFormat.VAST);
adUnitConfiguration.setRewarded(true);

init(adUnitConfiguration);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.prebid.mobile.rendering.video.VideoCreativeModel;
import org.prebid.mobile.rendering.video.vast.VASTErrorCodes;
import org.prebid.mobile.rendering.views.interstitial.InterstitialManager;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;
import org.prebid.mobile.units.configuration.AdFormat;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
Expand Down Expand Up @@ -85,7 +85,7 @@ public CreativeFactory(Context context,

public void start() {
try {
AdUnitConfiguration.AdUnitIdentifierType adUnitIdentifierType = mCreativeModel.getAdConfiguration().getAdUnitIdentifierType();
AdFormat adUnitIdentifierType = mCreativeModel.getAdConfiguration().getAdUnitIdentifierType();
switch (adUnitIdentifierType) {
case BANNER:
case INTERSTITIAL:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.prebid.mobile.rendering.models.internal.VastExtractorResult;
import org.prebid.mobile.rendering.networking.tracking.TrackingManager;
import org.prebid.mobile.rendering.video.OmEventTracker;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import java.util.ArrayList;
Expand Down Expand Up @@ -72,7 +73,7 @@ public void makeModels(AdUnitConfiguration adConfiguration, BidResponse bidRespo

public void makeVideoModels(AdUnitConfiguration adConfiguration, String vast) {
mAdConfiguration = adConfiguration;
mAdConfiguration.setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.VAST);
mAdConfiguration.setAdUnitIdentifierType(AdFormat.VAST);
mParserExtractor.extract(vast);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.prebid.mobile.rendering.video.VideoCreativeModel;
import org.prebid.mobile.rendering.video.vast.Tracking;
import org.prebid.mobile.rendering.video.vast.*;
import org.prebid.mobile.units.configuration.AdFormat;
import org.prebid.mobile.units.configuration.AdUnitConfiguration;

import java.util.ArrayList;
Expand Down Expand Up @@ -199,7 +200,7 @@ private void makeModelsContinued() {
endCardModel.setWidth(Integer.parseInt(companionAd.getWidth()));
endCardModel.setHeight(Integer.parseInt(companionAd.getHeight()));
endCardModel.setAdConfiguration(new AdUnitConfiguration());
endCardModel.getAdConfiguration().setAdUnitIdentifierType(AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
endCardModel.getAdConfiguration().setAdUnitIdentifierType(AdFormat.INTERSTITIAL);
endCardModel.setRequireImpressionUrl(false);
result.creativeModels.add(endCardModel);

Expand Down
Loading

0 comments on commit c64ae8b

Please sign in to comment.