RHCLOUD-28235 Unify how org ID is passed to connectors (phase 2)

gwenneg · Sep 25, 2023 · b164fdb · b164fdb
1 parent 28aad98
commit b164fdb
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/...om/redhat/cloud/notifications/connector/servicenow/ServiceNowCloudEventDataExtractor.java b/...om/redhat/cloud/notifications/connector/servicenow/ServiceNowCloudEventDataExtractor.java
@@ -26,8 +26,6 @@ public class ServiceNowCloudEventDataExtractor extends CloudEventDataExtractor {
     @Override
     public void extract(Exchange exchange, JsonObject cloudEventData) throws Exception {
 
-        // TODO Rely on the org ID parsing from IncomingCloudEventProcessor?
-        exchange.setProperty(ORG_ID, cloudEventData.getString("org_id"));
         exchange.setProperty(ACCOUNT_ID, cloudEventData.getString("account_id"));
 
         JsonObject metadata = cloudEventData.getJsonObject(NOTIF_METADATA);

diff --git a/...n/java/com/redhat/cloud/notifications/connector/splunk/SplunkCloudEventDataExtractor.java b/...n/java/com/redhat/cloud/notifications/connector/splunk/SplunkCloudEventDataExtractor.java
@@ -31,8 +31,6 @@ public class SplunkCloudEventDataExtractor extends CloudEventDataExtractor {
     @Override
     public void extract(Exchange exchange, JsonObject cloudEventData) throws Exception {
 
-        // TODO Rely on the org ID parsing from IncomingCloudEventProcessor?
-        exchange.setProperty(ORG_ID, cloudEventData.getString("org_id"));
         exchange.setProperty(ACCOUNT_ID, cloudEventData.getString("account_id"));
 
         JsonObject metadata = cloudEventData.getJsonObject(NOTIF_METADATA);

diff --git a/...java/com/redhat/cloud/notifications/connector/webhook/WebhookCloudEventDataExtractor.java b/...java/com/redhat/cloud/notifications/connector/webhook/WebhookCloudEventDataExtractor.java
@@ -45,12 +45,6 @@ public void extract(Exchange exchange, JsonObject cloudEventData) throws Malform
             exchange.setProperty(BASIC_AUTH_PASSWORD, basicAuth.getString("password"));
         }
 
-        if (cloudEventData.getJsonObject(PAYLOAD).containsKey("org_id")) {
-            exchange.setProperty(ORG_ID, cloudEventData.getJsonObject(PAYLOAD).getString("org_id"));
-        } else if (cloudEventData.getJsonObject(PAYLOAD).containsKey("redhatorgid")) {
-            exchange.setProperty(ORG_ID, cloudEventData.getJsonObject(PAYLOAD).getString("redhatorgid"));
-        }
-
         exchange.getIn().setBody(cloudEventData.getJsonObject(PAYLOAD).encode());
         exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.valueOf(endpointProperties.getString("method")));