fix comments

Author: przemkaczmarek

src/main/java/org/prebid/server/bidder/nativery/NativeryBidder.java

@@ -22,7 +22,6 @@
 import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.proto.openrtb.ext.ExtPrebid;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
-import org.prebid.server.proto.openrtb.ext.request.ExtSite;
 import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
 import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid;
@@ -70,7 +69,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
         for (Imp imp : request.getImp()) {
             try {
                 final ExtImpNativery extImp = parseImpExt(imp);
-                if (widgetId == null && extImp != null && StringUtils.isNotBlank(extImp.getWidgetId())) {
+                if (widgetId == null && StringUtils.isNotBlank(extImp.getWidgetId())) {
                     widgetId = extImp.getWidgetId();
                 }
                 validImps.add(imp);
@@ -83,13 +82,16 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
             return Result.of(Collections.emptyList(), errors);
         }
 
-        final ExtRequest updatedExt = buildRequestExtWithNativery(request.getExt(), isAmp, widgetId);
+        // 🟢 Zmienione — zamieniamy ExtRequest na ObjectNode
+        final ObjectNode originalExt = request.getExt() != null
+                ? mapper.mapper().convertValue(request.getExt(), ObjectNode.class)
+                : null;
+        final ExtRequest updatedExt = buildRequestExtWithNativery(originalExt, isAmp, widgetId);
 
         for (Imp imp : validImps) {
             final BidRequest singleImpRequest = request.toBuilder()
                     .imp(Collections.singletonList(imp))
-                    .ext(updatedExt)
-                    .cur(Collections.singletonList(DEFAULT_CURRENCY))
+                    .ext(updatedExt) // ✅ teraz typ się zgadza
                     .build();
 
             httpRequests.add(BidderUtil.defaultRequest(singleImpRequest, endpointUrl, mapper));
@@ -98,6 +100,18 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
         return Result.of(httpRequests, errors);
     }
 
+    private boolean isAmpRequest(BidRequest request) {
+        if (request.getSite() != null && request.getSite().getExt() != null) {
+            final JsonNode siteExt = mapper.mapper().valueToTree(request.getSite().getExt());
+            final JsonNode ampNode = siteExt.get("amp");
+            if (ampNode != null && ampNode.asInt(0) == 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private ExtImpNativery parseImpExt(Imp imp) {
         try {
             final ExtPrebid<?, ExtImpNativery> ext =
@@ -108,11 +122,13 @@ private ExtImpNativery parseImpExt(Imp imp) {
         }
     }
 
-    private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean isAmp, String widgetId) {
-        final ObjectNode extNode = mapper.mapper().convertValue(originalExt, ObjectNode.class);
-        final ObjectNode root = extNode != null ? extNode : mapper.mapper().createObjectNode();
+    private ExtRequest buildRequestExtWithNativery(ObjectNode originalExt, boolean isAmp, String widgetId) {
+        final ObjectNode root = originalExt != null
+                ? originalExt.deepCopy()
+                : mapper.mapper().createObjectNode();
 
         final ObjectNode nativeryNode = root.with("nativery");
+
         nativeryNode.put("isAmp", isAmp);
         if (widgetId != null) {
             nativeryNode.put("widgetId", widgetId);
@@ -121,19 +137,6 @@ private ExtRequest buildRequestExtWithNativery(ExtRequest originalExt, boolean i
         return mapper.mapper().convertValue(root, ExtRequest.class);
     }
 
-    private boolean isAmpRequest(BidRequest request) {
-        if (request.getSite() == null || request.getSite().getExt() == null) {
-            return false;
-        }
-        try {
-            final ExtSite extSite = mapper.mapper().convertValue(request.getSite().getExt(), ExtSite.class);
-            final Integer amp = extSite != null ? extSite.getAmp() : null;
-            return amp != null && amp == 1;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
     @Override
     public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
         final List<BidderError> errors = new ArrayList<>();

src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java

@@ -29,8 +29,8 @@ BidderConfigurationProperties configurationProperties() {
 
     @Bean
     BidderDeps nativeryBidderDeps(BidderConfigurationProperties nativeryConfigurationProperties,
-                               @NotBlank @Value("${external-url}") String externalUrl,
-                               JacksonMapper mapper) {
+                                  @NotBlank @Value("${external-url}") String externalUrl,
+                                  JacksonMapper mapper) {
 
         return BidderDepsAssembler.forBidder(BIDDER_NAME)
                 .withConfig(nativeryConfigurationProperties)

src/main/resources/bidder-config/nativery.yaml

@@ -8,5 +8,5 @@ adapters:
         - banner
         - video
         - native
-      supported-vendors: []
-      vendor-id: 0
+      supported-vendors:
+      vendor-id: 1133

src/test/java/org/prebid/server/bidder/nativery/NativeryBidderTest.java

@@ -19,6 +19,7 @@
 import org.prebid.server.bidder.model.HttpResponse;
 import org.prebid.server.bidder.model.Result;
 import org.prebid.server.proto.openrtb.ext.ExtPrebid;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
 import org.prebid.server.proto.openrtb.ext.request.ExtSite;
 import org.prebid.server.proto.openrtb.ext.request.nativery.ExtImpNativery;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
@@ -128,6 +129,37 @@ public void makeHttpRequestsShouldSetExtWithWidgetId() {
                 .containsOnly("widget1");
     }
 
+    @Test
+    public void makeHttpRequestsShouldPreserveOriginalExtFields() {
+        // given
+        final ObjectNode extNode = mapper.createObjectNode();
+        extNode.put("accountId", "acc-123");
+
+        final BidRequest bidRequest = givenBidRequest(
+                requestBuilder -> {
+                    try {
+                        return requestBuilder.ext(
+                                mapper.readValue(mapper.writeValueAsString(extNode), ExtRequest.class)
+                        );
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                },
+                UnaryOperator.identity());
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+
+        final ObjectNode resultingExt = mapper.convertValue(
+                result.getValue().get(0).getPayload().getExt(), ObjectNode.class);
+
+        assertThat(resultingExt.path("accountId").asText()).isEqualTo("acc-123");
+        assertThat(resultingExt.path("nativery").path("widgetId").asText()).isEqualTo("widget1");
+    }
+
     @Test
     public void makeHttpRequestsShouldSetExtWithAmpTrue() {
         // given
@@ -169,7 +201,7 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCannotBeParsed() {
     }
 
     @Test
-    public void makeHttpRequestsShouldSetDefaultCurrency() {
+    public void makeHttpRequestsShouldNotSetCurrencyIfNotProvided() {
         // given
         final BidRequest bidRequest = givenBidRequest(UnaryOperator.identity());
 
@@ -181,8 +213,7 @@ public void makeHttpRequestsShouldSetDefaultCurrency() {
         assertThat(result.getValue())
                 .extracting(HttpRequest::getPayload)
                 .extracting(BidRequest::getCur)
-                .extracting(currencies -> currencies.get(0))
-                .containsOnly(DEFAULT_CURRENCY);
+                .allSatisfy(cur -> assertThat(cur).isNull());
     }
 
     @Test