Unruly: code cleanup

Author: zxPhoenix

src/main/java/org/prebid/server/bidder/unruly/UnrulyBidder.java

@@ -19,7 +19,6 @@
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.json.DecodeException;
 import org.prebid.server.json.JacksonMapper;
-import org.prebid.server.proto.openrtb.ext.request.unruly.ExtImpUnruly;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebidVideo;
@@ -34,7 +33,7 @@
 
 public class UnrulyBidder implements Bidder<BidRequest> {
 
-    private static final TypeReference<UnrulyExtImp<?, ExtImpUnruly>> UNRULY_EXT_TYPE_REFERENCE =
+    private static final TypeReference<UnrulyExtImp<?>> UNRULY_EXT_TYPE_REFERENCE =
             new TypeReference<>() {
             };
 
@@ -58,7 +57,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
 
     private Imp modifyImp(Imp imp) {
 
-        final UnrulyExtImp<?, ExtImpUnruly> unrulyExtImp = parseImpExt(imp);
+        final UnrulyExtImp<?> unrulyExtImp = parseImpExt(imp);
         return imp.toBuilder()
                 .ext(mapper.mapper().valueToTree(UnrulyExtImp.of(
                         null,
@@ -67,7 +66,7 @@ private Imp modifyImp(Imp imp) {
                 .build();
     }
 
-    private UnrulyExtImp<?, ExtImpUnruly> parseImpExt(Imp imp) {
+    private UnrulyExtImp<?> parseImpExt(Imp imp) {
         try {
             return mapper.mapper().convertValue(imp.getExt(), UNRULY_EXT_TYPE_REFERENCE);
         } catch (IllegalArgumentException e) {

src/main/java/org/prebid/server/bidder/unruly/proto/UnrulyExtImp.java

@@ -4,25 +4,26 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 import org.prebid.server.proto.openrtb.ext.request.ExtImpAuctionEnvironment;
+import org.prebid.server.proto.openrtb.ext.request.unruly.ExtImpUnruly;
 
 @Value(staticConstructor = "of")
-public class UnrulyExtImp<P, B> {
+public class UnrulyExtImp<P> {
 
     P prebid;
 
-    B bidder;
+    ExtImpUnruly bidder;
 
     String gpid;
 
     @JsonProperty("ae")
     @JsonInclude(value = JsonInclude.Include.NON_DEFAULT)
     ExtImpAuctionEnvironment auctionEnvironment;
 
-    public static <P, B> UnrulyExtImp<P, B> of(P prebid, B bidder, String gpid) {
+    public static <P> UnrulyExtImp<P> of(P prebid, ExtImpUnruly bidder, String gpid) {
         return of(prebid, bidder, gpid, null);
     }
 
-    public static <P, B> UnrulyExtImp<P, B> of(P prebid, B bidder) {
+    public static <P> UnrulyExtImp<P> of(P prebid, ExtImpUnruly bidder) {
         return of(prebid, bidder, null, null);
     }
 }

src/test/java/org/prebid/server/bidder/unruly/UnrulyBidderTest.java

@@ -21,6 +21,7 @@
 import org.prebid.server.bidder.model.HttpResponse;
 import org.prebid.server.bidder.model.Result;
 import org.prebid.server.bidder.unruly.proto.UnrulyExtImp;
+import org.prebid.server.proto.openrtb.ext.request.unruly.ExtImpUnruly;
 
 import java.util.List;
 import java.util.Map;
@@ -312,7 +313,7 @@ private static Imp givenImp(Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomiz
         final ObjectNode impExt = mapper.valueToTree(
                 UnrulyExtImp.of(
                         null,
-                        mapper.createObjectNode().set("siteId", IntNode.valueOf(123)),
+                        ExtImpUnruly.of(123),
                         "gpid"));
 
         return impCustomizer.apply(