fixes

Author: Samuel Alejandro Maldonado Garcia

src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java

@@ -1,9 +1,11 @@
 package org.prebid.server.bidder.alvads;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.iab.openrtb.request.Banner;
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
 import com.iab.openrtb.request.Site;
+import com.iab.openrtb.request.Video;
 import com.iab.openrtb.response.Bid;
 import com.iab.openrtb.response.BidResponse;
 import io.vertx.core.http.HttpMethod;
@@ -25,13 +27,13 @@
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 import org.prebid.server.util.HttpUtil;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class AlvadsBidder implements Bidder<AlvadsRequestOrtb> {
@@ -75,7 +77,6 @@ private AlvadsImpExt parseImpExt(Imp imp) {
     }
 
     private HttpRequest<AlvadsRequestOrtb> makeHttpRequest(BidRequest request, Imp imp, AlvadsImpExt impExt) {
-        final String resolvedUrl = makeUrl(impExt);
         final AlvaAdsImp impObj = makeImp(imp);
         final AlvaAdsSite siteObj = makeSite(request.getSite(), impExt.getPublisherUniqueId());
         final AlvadsRequestOrtb alvadsRequest = AlvadsRequestOrtb.builder()
@@ -89,31 +90,24 @@ private HttpRequest<AlvadsRequestOrtb> makeHttpRequest(BidRequest request, Imp i
 
         return HttpRequest.<AlvadsRequestOrtb>builder()
                 .method(HttpMethod.POST)
-                .uri(resolvedUrl)
+                .uri(endpointUrl)
                 .headers(HttpUtil.headers())
                 .payload(alvadsRequest)
                 .body(mapper.encodeToBytes(alvadsRequest))
                 .impIds(alvadsRequest.getImp().stream().map(AlvaAdsImp::getId).collect(Collectors.toSet()))
                 .build();
     }
 
-    private String makeUrl(AlvadsImpExt impExt) {
-        final String resolvedUrl = impExt.getEndpointUrl() != null ? impExt.getEndpointUrl() : endpointUrl;
-        try {
-            URI.create(resolvedUrl);
-            return resolvedUrl;
-        } catch (IllegalArgumentException e) {
-            throw new PreBidException("Invalid endpoint URL: " + resolvedUrl, e);
-        }
-    }
-
     private static AlvaAdsImp makeImp(Imp imp) {
+        final Banner banner = imp.getBanner();
+        final Video video = imp.getVideo();
+
         return AlvaAdsImp.builder()
                 .id(imp.getId())
                 .tagid(imp.getTagid())
                 .bidfloor(imp.getBidfloor())
-                .banner(imp.getBanner() != null ? sizes(imp.getBanner().getW(), imp.getBanner().getH()) : null)
-                .video(imp.getVideo() != null ? sizes(imp.getVideo().getW(), imp.getVideo().getH()) : null)
+                .banner(banner != null ? sizes(banner.getW(), banner.getH()) : null)
+                .video(video != null ? sizes(video.getW(), video.getH()) : null)
                 .build();
     }
 
@@ -175,13 +169,9 @@ private BidType getBidType(Bid bid, AlvaAdsImp imp) {
             return BidType.video;
         }
 
-        final ExtBidAlvads bidExt = getBidExt(bid);
-        if (bidExt == null) {
-            return BidType.banner;
-        }
-
-        final BidType crtype = bidExt.getCrtype();
-        return crtype != null ? crtype : BidType.banner;
+        return Optional.ofNullable(getBidExt(bid))
+                .map(ExtBidAlvads::getCrtype)
+                .orElse(BidType.banner);
     }
 
     private ExtBidAlvads getBidExt(Bid bid) {

src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java

@@ -1,10 +1,10 @@
 package org.prebid.server.bidder.alvads;
 
-import lombok.Data;
+import lombok.Value;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 
-@Data
+@Value
 public class ExtBidAlvads {
 
-    private BidType crtype;
+     BidType crtype;
 }