From c0320b96d3ca1a82cae0b8126b9b56b3ab2d277d Mon Sep 17 00:00:00 2001 From: EvgeniiMunin Date: Thu, 24 Oct 2024 03:22:47 -0700 Subject: [PATCH] fix review11: refactos --- .../data/core/GreenbidsInferenceDataService.java | 4 +--- .../time/data/core/GreenbidsInvocationService.java | 3 +-- .../real/time/data/core/GreenbidsUserAgent.java | 12 +++++------- .../real/time/data/core/OnnxModelRunner.java | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataService.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataService.java index 62c233b6387..2ed565f8fa8 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataService.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInferenceDataService.java @@ -45,9 +45,7 @@ public List extractThrottlingMessagesFromBidRequest(BidReques .map(GreenbidsUserAgent::new) .orElse(null); - return extractThrottlingMessages( - bidRequest, - userAgent); + return extractThrottlingMessages(bidRequest, userAgent); } private List extractThrottlingMessages( diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java index a0b2c2e8d39..67d42d47bc2 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java @@ -115,7 +115,6 @@ private Ortb2ImpExtResult createOrtb2ImpExt( final Map impBiddersFilterMap = impsBiddersFilterMap.get(imp.getId()); final ExplorationResult explorationResult = ExplorationResult.of( greenbidsId, impBiddersFilterMap, isExploration); - return Ortb2ImpExtResult.of( - explorationResult, tid); + return Ortb2ImpExtResult.of(explorationResult, tid); } } diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsUserAgent.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsUserAgent.java index 1cd8ec4f6d7..b7450d71560 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsUserAgent.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsUserAgent.java @@ -42,19 +42,17 @@ public String getDevice() { public String getBrowser() { return Optional.ofNullable(userAgent) .filter(userAgent -> !"Other".equals(userAgent.family) && StringUtils.isNoneBlank(userAgent.family)) - .map(userAgent -> { - final String major = Optional.ofNullable(userAgent.major).orElse(StringUtils.EMPTY); - return "%s %s".formatted(userAgent.family, major).trim(); - }) + .map(ua -> "%s %s".formatted(ua.family, StringUtils.defaultString(userAgent.major)).trim()) .orElse(StringUtils.EMPTY); } private boolean isPC() { + final String osFamily = osFamily(); return Optional.ofNullable(userAgentString) .map(userAgent -> userAgent.contains("Windows NT") - || PC_OS_FAMILIES.contains(osFamily()) - || ("Windows".equals(osFamily()) && "ME".equals(osMajor())) - || ("Mac OS X".equals(osFamily()) && !userAgent.contains("Silk")) + || PC_OS_FAMILIES.contains(osFamily) + || ("Windows".equals(osFamily) && "ME".equals(osMajor())) + || ("Mac OS X".equals(osFamily) && !userAgent.contains("Silk")) || (userAgent.contains("Linux") && userAgent.contains("X11"))) .orElse(false); } diff --git a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunner.java b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunner.java index bcc89599895..d5570f30272 100644 --- a/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunner.java +++ b/extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/OnnxModelRunner.java @@ -18,7 +18,7 @@ public OnnxModelRunner(byte[] onnxModelBytes) throws OrtException { } public OrtSession.Result runModel(String[][] throttlingInferenceRow) throws OrtException { - final OnnxTensor inputTensor = OnnxTensor.createTensor(OrtEnvironment.getEnvironment(), throttlingInferenceRow); + final OnnxTensor inputTensor = OnnxTensor.createTensor(ENVIRONMENT, throttlingInferenceRow); return session.run(Collections.singletonMap("input", inputTensor)); } }