Merge pull request #20 from WURFL/PREB-50

Preb 50

Author: andreacastello

extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/OrtbDeviceUpdater.java

@@ -55,6 +55,7 @@ public AuctionRequestPayload apply(AuctionRequestPayload auctionRequestPayload)
     private Device update(Device ortbDevice) {
         final String make = tryUpdateField(ortbDevice.getMake(), this::getWurflMake);
         final String model = tryUpdateField(ortbDevice.getModel(), this::getWurflModel);
+        final String hwv = tryUpdateField(ortbDevice.getHwv(), this::getWurflModel);
         final Integer deviceType = tryUpdateField(
                 Optional.ofNullable(ortbDevice.getDevicetype())
                         .filter(it -> it > 0)
@@ -72,6 +73,7 @@ private Device update(Device ortbDevice) {
                 .make(make)
                 .model(model)
                 .devicetype(deviceType)
+                .hwv(hwv)
                 .os(os)
                 .osv(osv)
                 .h(h)
@@ -103,42 +105,66 @@ private String getWurflModel() {
     }
 
     private Integer getWurflDeviceType() {
-        try {
-            if (wurflDevice.getVirtualCapabilityAsBool("is_mobile")) {
-                // if at least one of these capabilities is not defined, the mobile device type is undefined
-                final boolean isPhone = wurflDevice.getVirtualCapabilityAsBool("is_phone");
-                final boolean isTablet = wurflDevice.getCapabilityAsBool("is_tablet");
-                return isPhone || isTablet ? 1 : 6;
-            }
 
-            if (wurflDevice.getVirtualCapabilityAsBool("is_full_desktop")) {
-                return 2;
-            }
+        if (getWurflIsOtt()) {
+            return 7;
+        }
 
-            if (wurflDevice.getCapabilityAsBool("is_connected_tv")) {
-                return 3;
-            }
+        final Boolean isConsole = getWurflIsConsole();
+        if (isConsole) {
+            return 6;
+        }
 
-            if (wurflDevice.getCapabilityAsBool("is_phone")) {
-                return 4;
-            }
+        if ("out_of_home_device".equals(getWurflPhysicalFormFactor())) {
+            return 8;
+        }
 
-            if (wurflDevice.getCapabilityAsBool("is_tablet")) {
-                return 5;
-            }
+        final String formFactor = getWurflFormFactor();
+        return switch (formFactor) {
+            case "Desktop" -> 2;
+            case "Smartphone", "Feature Phone" -> 4;
+            case "Tablet" -> 5;
+            case "Smart-TV" -> 3;
+            case "Other Non-Mobile" -> 6;
+            case "Other Mobile" -> 1;
+            default -> null;
+        };
+    }
 
-            if (wurflDevice.getCapabilityAsBool("is_ott")) {
-                return 7;
-            }
+    private Boolean getWurflIsOtt() {
+        try {
+            return wurflDevice.getCapabilityAsBool("is_ott");
+        } catch (CapabilityNotDefinedException e) {
+            logger.warn("Failed to get is_ott from WURFL device capabilities", e);
+            return Boolean.FALSE;
+        }
+    }
 
-            final String physicalFormFactor = wurflDevice.getCapability("physical_form_factor");
-            if (physicalFormFactor != null && physicalFormFactor.equals("out_of_home_device")) {
-                return 8;
-            }
-        } catch (CapabilityNotDefinedException | VirtualCapabilityNotDefinedException | NumberFormatException e) {
-            logger.warn("Failed to determine device type from WURFL device capabilities", e);
+    private String getWurflFormFactor() {
+        try {
+            return wurflDevice.getVirtualCapability("form_factor");
+        } catch (VirtualCapabilityNotDefinedException e) {
+            logger.warn("Failed to get form_factor from WURFL device capabilities", e);
+            return "";
+        }
+    }
+
+    private String getWurflPhysicalFormFactor() {
+        try {
+            return wurflDevice.getCapability("physical_form_factor");
+        } catch (CapabilityNotDefinedException e) {
+            logger.warn("Failed to get physical_form_factor from WURFL device capabilities", e);
+            return "";
+        }
+    }
+
+    private Boolean getWurflIsConsole() {
+        try {
+            return wurflDevice.getCapabilityAsBool("is_console");
+        } catch (CapabilityNotDefinedException e) {
+            logger.warn("Failed to get is_console from WURFL device capabilities", e);
+            return Boolean.FALSE;
         }
-        return null;
     }
 
     private String getWurflOs() {