optable-targeting: Code cleanup

Author: softcoder594

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/config/OptableTargetingProperties.java

@@ -17,8 +17,7 @@ public final class OptableTargetingProperties {
     @JsonProperty("api-key")
     String apiKey;
 
-    @JsonProperty("user-id")
-    String userId;
+    String tenant;
 
     String origin;
 

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/v1/core/EndpointResolver.java

@@ -2,15 +2,15 @@
 
 public class EndpointResolver {
 
-    private static final String ACCOUNT_ID = "{ACCOUNT_ID}";
+    private static final String TENANT = "{TENANT}";
 
     private static final String ORIGIN = "{ORIGIN}";
 
     private EndpointResolver() {
     }
 
-    public static String resolve(String endpointTemplate, String accountId, String origin) {
-        return endpointTemplate.replace(ACCOUNT_ID, accountId)
+    public static String resolve(String endpointTemplate, String tenant, String origin) {
+        return endpointTemplate.replace(TENANT, tenant)
                 .replace(ORIGIN, origin);
     }
 }

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/v1/core/OptableTargeting.java

@@ -43,13 +43,13 @@ public Future<TargetingResult> getTargeting(OptableTargetingProperties propertie
                         ? getOrFetchTargetingResults(
                                 properties.getCache(),
                                 properties.getApiKey(),
-                                properties.getUserId(),
+                                properties.getTenant(),
                                 properties.getOrigin(),
                                 query,
                                 attributes.getIps(), timeout)
                         : apiClient.getTargeting(
                                 properties.getApiKey(),
-                                properties.getUserId(),
+                                properties.getTenant(),
                                 properties.getOrigin(),
                                 query,
                                 attributes.getIps(),
@@ -58,24 +58,24 @@ public Future<TargetingResult> getTargeting(OptableTargetingProperties propertie
     }
 
     private Future<TargetingResult> getOrFetchTargetingResults(CacheProperties cacheProperties, String apiKey,
-                                                               String accountId, String origin,
+                                                               String tenant, String origin,
                                                                String query, List<String> ips, long timeout) {
 
-        final String key = accountId + ":" +URLEncoder.encode(query, StandardCharsets.UTF_8);
+        final String key = tenant + ":" +URLEncoder.encode(query, StandardCharsets.UTF_8);
 
         return cache.get(key)
                 .recover(err -> Future.succeededFuture(null))
                 .compose(entry -> entry != null
                         ? Future.succeededFuture(entry)
-                        : fetchAndCacheResult(accountId, origin, cacheProperties.getTtlseconds(), apiKey,
+                        : fetchAndCacheResult(tenant, origin, cacheProperties.getTtlseconds(), apiKey,
                         query, ips, timeout));
 
     }
 
-    private Future<TargetingResult> fetchAndCacheResult(String accountId, String origin, int ttlSeconds, String apiKey,
+    private Future<TargetingResult> fetchAndCacheResult(String tenant, String origin, int ttlSeconds, String apiKey,
                                                         String query, List<String> ips, long timeout) {
 
-        return apiClient.getTargeting(apiKey, accountId, origin, query, ips, timeout)
-                .compose(result -> cache.put(accountId + ":" + query, result, ttlSeconds).map(result));
+        return apiClient.getTargeting(apiKey, tenant, origin, query, ips, timeout)
+                .compose(result -> cache.put(tenant + ":" + query, result, ttlSeconds).map(result));
     }
 }

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/v1/net/APIClient.java

@@ -51,7 +51,7 @@ public APIClient(String endpoint,
         this.responseMapper = Objects.requireNonNull(responseMapper);
     }
 
-    public Future<TargetingResult> getTargeting(String apiKey, String accountId, String origin,
+    public Future<TargetingResult> getTargeting(String apiKey, String tenant, String origin,
                                                 String query, List<String> ips, long timeout) {
 
         final MultiMap headers = HeadersMultiMap.headers()
@@ -68,7 +68,7 @@ public Future<TargetingResult> getTargeting(String apiKey, String accountId, Str
         }
 
         final HttpRequest request = HttpRequest.builder()
-                .uri(EndpointResolver.resolve(endpoint, accountId, origin))
+                .uri(EndpointResolver.resolve(endpoint, tenant, origin))
                 .query(query)
                 .headers(headers)
                 .build();

sample/configs/prebid-config-with-optable.yaml

@@ -50,4 +50,4 @@ hooks:
     enabled: true
   modules:
     optable-targeting:
-      api-endpoint: https://na.edge.optable.co/v2/targeting?t={ACCOUNT_ID}&o={ORIGIN}
+      api-endpoint: https://na.edge.optable.co/v2/targeting?t={TENANT}&o={ORIGIN}

sample/configs/sample-app-settings-optable.yaml

@@ -19,7 +19,7 @@ accounts:
       modules:
         optable-targeting:
           api-key: key
-          user-id: optable
+          tenant: optable
           origin: web-sdk-demo
           ppid-mapping: { "pubcid.org": "c" }
           adserver-targeting: true