Unruly: code cleanup

Author: zxPhoenix

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

@@ -15,11 +15,10 @@
 import org.prebid.server.bidder.model.BidderError;
 import org.prebid.server.bidder.model.HttpRequest;
 import org.prebid.server.bidder.model.Result;
-import org.prebid.server.bidder.unruly.proto.UnrulyExtImp;
+import org.prebid.server.bidder.unruly.proto.UnrulyExtPrebid;
 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<UnrulyExtPrebid> UNRULY_EXT_TYPE_REFERENCE =
             new TypeReference<>() {
             };
 
@@ -58,16 +57,15 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
 
     private Imp modifyImp(Imp imp) {
 
-        final UnrulyExtImp<?, ExtImpUnruly> unrulyExtImp = parseImpExt(imp);
+        final UnrulyExtPrebid unrulyExtPrebid = parseImpExt(imp);
         return imp.toBuilder()
-                .ext(mapper.mapper().valueToTree(UnrulyExtImp.of(
-                        null,
-                        unrulyExtImp.getBidder(),
-                        unrulyExtImp.getGpid())))
+                .ext(mapper.mapper().valueToTree(UnrulyExtPrebid.of(
+                        unrulyExtPrebid.getBidder(),
+                        unrulyExtPrebid.getGpid())))
                 .build();
     }
 
-    private UnrulyExtImp<?, ExtImpUnruly> parseImpExt(Imp imp) {
+    private UnrulyExtPrebid 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

@@ -0,0 +1,12 @@
+package org.prebid.server.bidder.unruly.proto;
+
+import lombok.Value;
+import org.prebid.server.proto.openrtb.ext.request.unruly.ExtImpUnruly;
+
+@Value(staticConstructor = "of")
+public class UnrulyExtPrebid {
+
+    ExtImpUnruly bidder;
+
+    String gpid;
+}

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

@@ -20,7 +20,8 @@
 import org.prebid.server.bidder.model.HttpRequest;
 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.bidder.unruly.proto.UnrulyExtPrebid;
+import org.prebid.server.proto.openrtb.ext.request.unruly.ExtImpUnruly;
 
 import java.util.List;
 import java.util.Map;
@@ -310,10 +311,7 @@ private static BidRequest givenBidRequest(Function<Imp.ImpBuilder, Imp.ImpBuilde
 
     private static Imp givenImp(Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomizer) {
         final ObjectNode impExt = mapper.valueToTree(
-                UnrulyExtImp.of(
-                        null,
-                        mapper.createObjectNode().set("siteId", IntNode.valueOf(123)),
-                        "gpid"));
+                UnrulyExtPrebid.of(ExtImpUnruly.of(123), "gpid"));
 
         return impCustomizer.apply(
                         Imp.builder()