Skip to content

Commit 5b5af65

Browse files
moodiRealistmoodiRealist
authored
Merge pull request #269 from SolaceProducts/moodiRealist/DATAGO-103122-sap-scan
DATAGO-103122: Scan to federated accounts from the primary account
2 parents 9c41256 + fef050b commit 5b5af65

File tree

25 files changed

+205
-87
lines changed

25 files changed

+205
-87
lines changed

‎service/application/src/main/java/com/solace/maas/ep/common/messages/ScanCommandMessage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ScanCommandMessage extends MOPMessage implements CommandMessageWith
2222
private List<ScanType> scanTypes;
2323
private List<ScanDestination> destinations;
2424
private List<EventBrokerResourceConfiguration> resources;
25-
25+
private String originOrgId;
2626

2727
public ScanCommandMessage(String messagingServiceId,
2828
String scanId,

‎service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
public class ScanDataMessage extends MOPMessage {
1111
private String orgId;
1212

13+
private String originOrgId;
14+
1315
private String scanId;
1416

1517
private String scanType;
@@ -19,6 +21,7 @@ public class ScanDataMessage extends MOPMessage {
1921
private String timestamp;
2022

2123
public ScanDataMessage(String orgId,
24+
String originOrgId,
2225
String scanId,
2326
String traceId,
2427
String actorId,
@@ -32,6 +35,7 @@ public ScanDataMessage(String orgId,
3235
.withUhFlag(MOPUHFlag.ignore);
3336

3437
this.orgId = orgId;
38+
this.originOrgId = originOrgId;
3539
this.scanId = scanId;
3640
this.scanType = scanType;
3741
this.data = data;

‎service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataStatusMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public class ScanDataStatusMessage extends MOPMessage {
1414

1515
private String orgId;
1616

17+
private String originOrgId;
18+
1719
private String scanId;
1820

1921
private String status;
@@ -23,6 +25,7 @@ public class ScanDataStatusMessage extends MOPMessage {
2325
private String scanType;
2426

2527
public ScanDataStatusMessage(String orgId,
28+
String originOrgId,
2629
String scanId,
2730
String traceId,
2831
String actorId,
@@ -36,6 +39,7 @@ public ScanDataStatusMessage(String orgId,
3639
.withUhFlag(MOPUHFlag.ignore);
3740

3841
this.orgId = orgId;
42+
this.originOrgId = originOrgId;
3943
this.scanId = scanId;
4044
this.status = status;
4145
this.description = description;

‎service/application/src/main/java/com/solace/maas/ep/common/messages/ScanLogMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
public class ScanLogMessage extends MOPMessage {
1111
private String orgId;
1212

13+
private String originOrgId;
14+
1315
private String scanId;
1416

1517
private String level;
@@ -19,6 +21,7 @@ public class ScanLogMessage extends MOPMessage {
1921
private Long timestamp;
2022

2123
public ScanLogMessage(String orgId,
24+
String originOrgId,
2225
String scanId,
2326
String traceId,
2427
String actorId,
@@ -32,6 +35,7 @@ public ScanLogMessage(String orgId,
3235
.withUhFlag(MOPUHFlag.ignore);
3336

3437
this.orgId = orgId;
38+
this.originOrgId = originOrgId;
3539
this.scanId = scanId;
3640
this.level = level;
3741
this.log = log;

‎service/application/src/main/java/com/solace/maas/ep/common/messages/ScanStatusMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class ScanStatusMessage extends MOPMessage {
1616

1717
private String orgId;
1818

19+
private String originOrgId;
20+
1921
private String scanId;
2022

2123
private String status;
@@ -25,6 +27,7 @@ public class ScanStatusMessage extends MOPMessage {
2527
private List<String> scanTypes;
2628

2729
public ScanStatusMessage(String orgId,
30+
String originOrgId,
2831
String scanId,
2932
String traceId,
3033
String actorId,
@@ -38,6 +41,7 @@ public ScanStatusMessage(String orgId,
3841
.withUhFlag(MOPUHFlag.ignore);
3942

4043
this.orgId = orgId;
44+
this.originOrgId = originOrgId;
4145
this.scanId = scanId;
4246
this.status = status;
4347
this.description = description;

‎service/application/src/main/java/com/solace/maas/ep/event/management/agent/logging/StreamingAppender.java‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ public class StreamingAppender extends AppenderBase<ILoggingEvent> {
2727
@Override
2828
protected void append(ILoggingEvent event) {
2929
String orgId = event.getMDCPropertyMap().get(RouteConstants.ORG_ID);
30+
String originOrgId = event.getMDCPropertyMap().get(RouteConstants.ORIGIN_ORG_ID);
3031
if (!standalone) {
3132
if (StringUtils.isNotEmpty(event.getMDCPropertyMap().get(RouteConstants.SCAN_ID))) {
3233
sendScanLogsAsync(orgId,
34+
originOrgId,
3335
event,
3436
event.getMDCPropertyMap().get(RouteConstants.SCAN_ID),
3537
event.getMDCPropertyMap().get(RouteConstants.TRACE_ID),
@@ -40,6 +42,7 @@ protected void append(ILoggingEvent event) {
4042
} else if (StringUtils.isNotEmpty(event.getMDCPropertyMap().get(RouteConstants.COMMAND_CORRELATION_ID))) {
4143
sendCommandLogsAsync(
4244
orgId,
45+
originOrgId,
4346
event,
4447
event.getMDCPropertyMap().get(RouteConstants.COMMAND_CORRELATION_ID),
4548
event.getMDCPropertyMap().get(RouteConstants.TRACE_ID),
@@ -49,8 +52,13 @@ protected void append(ILoggingEvent event) {
4952
}
5053
}
5154

52-
private void sendCommandLogsAsync(String orgId, ILoggingEvent event, String commandCorrelationId, String traceId,
53-
String actorId, String messagingServiceId) {
55+
private void sendCommandLogsAsync(String orgId,
56+
String originOrgId,
57+
ILoggingEvent event,
58+
String commandCorrelationId,
59+
String traceId,
60+
String actorId,
61+
String messagingServiceId) {
5462

5563

5664
RouteEntity route = RouteEntity.builder()
@@ -64,6 +72,7 @@ private void sendCommandLogsAsync(String orgId, ILoggingEvent event, String comm
6472
exchange.getIn().setHeader(RouteConstants.TRACE_ID, traceId);
6573
exchange.getIn().setHeader(RouteConstants.ACTOR_ID, actorId);
6674
exchange.getIn().setHeader(RouteConstants.ORG_ID, orgId);
75+
exchange.getIn().setHeader(RouteConstants.ORIGIN_ORG_ID, originOrgId);
6776
exchange.getIn().setHeader(RouteConstants.MESSAGING_SERVICE_ID, messagingServiceId);
6877

6978
exchange.getIn().setBody(event);
@@ -76,8 +85,15 @@ private void sendCommandLogsAsync(String orgId, ILoggingEvent event, String comm
7685
});
7786
}
7887

79-
private void sendScanLogsAsync(String orgId, ILoggingEvent event, String scanId, String traceId, String actorId,
80-
String scanType, String groupId, String messagingServiceId) {
88+
private void sendScanLogsAsync(String orgId,
89+
String originOrgId,
90+
ILoggingEvent event,
91+
String scanId,
92+
String traceId,
93+
String actorId,
94+
String scanType,
95+
String groupId,
96+
String messagingServiceId) {
8197
RouteEntity route = creatLoggingRoute(scanType, messagingServiceId);
8298

8399
producerTemplate.asyncSend(route.getId(), exchange -> {
@@ -87,6 +103,7 @@ private void sendScanLogsAsync(String orgId, ILoggingEvent event, String scanId,
87103
exchange.getIn().setHeader(RouteConstants.ACTOR_ID, actorId);
88104
exchange.getIn().setHeader(RouteConstants.SCAN_TYPE, scanType);
89105
exchange.getIn().setHeader(RouteConstants.ORG_ID, orgId);
106+
exchange.getIn().setHeader(RouteConstants.ORIGIN_ORG_ID, originOrgId);
90107
exchange.getIn().setHeader(RouteConstants.SCHEDULE_ID, groupId);
91108
exchange.getIn().setHeader(RouteConstants.MESSAGING_SERVICE_ID, messagingServiceId);
92109

‎service/application/src/main/java/com/solace/maas/ep/event/management/agent/processor/ScanDataProcessor.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ public void process(Exchange exchange) throws Exception {
4646
String actorId = (String) properties.get(RouteConstants.ACTOR_ID);
4747
String scanType = (String) properties.get(RouteConstants.SCAN_TYPE);
4848
String orgId = ProcessorUtils.determineOrganizationId(eventPortalProperties, exchange);
49+
String originOrgId = (String) properties.get(RouteConstants.ORIGIN_ORG_ID);
4950
Boolean isImportOp = (Boolean) properties.get(RouteConstants.IS_DATA_IMPORT);
5051

5152
ScanDataMessage scanDataMessage = new ScanDataMessage(
5253
orgId,
54+
originOrgId,
5355
scanId,
5456
traceId,
5557
actorId,

‎service/application/src/main/java/com/solace/maas/ep/event/management/agent/processor/ScanLogsProcessor.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,18 @@ public void process(Exchange exchange) throws Exception {
3939
String scanId = (String) properties.get(RouteConstants.SCAN_ID);
4040
String traceId = (String) properties.get(RouteConstants.TRACE_ID);
4141
String orgId = ProcessorUtils.determineOrganizationId(eventPortalProperties, exchange);
42+
String originOrgId = (String) properties.get(RouteConstants.ORIGIN_ORG_ID);
4243
String actorId = (String) properties.get(RouteConstants.ACTOR_ID);
4344
String messagingServiceId = (String) properties.get(RouteConstants.MESSAGING_SERVICE_ID);
4445

45-
ScanLogMessage logDataMessage = new ScanLogMessage(orgId, scanId, traceId, actorId, event.getLevel().toString(),
46-
String.format("%s%s", event.getFormattedMessage(), "\n"), event.getTimeStamp());
46+
ScanLogMessage logDataMessage = new ScanLogMessage(orgId,
47+
originOrgId,
48+
scanId,
49+
traceId,
50+
actorId,
51+
event.getLevel().toString(),
52+
String.format("%s%s", event.getFormattedMessage(), "\n"),
53+
event.getTimeStamp());
4754

4855
topicDetails.put("orgId", orgId);
4956
topicDetails.put("runtimeAgentId", eventPortalProperties.getRuntimeAgentId());

‎service/application/src/main/java/com/solace/maas/ep/event/management/agent/processor/ScanStatusOverAllProcessor.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void process(Exchange exchange) throws Exception {
4343
String actorId = (String) properties.get(RouteConstants.ACTOR_ID);
4444
ScanStatus status = (ScanStatus) properties.get(RouteConstants.SCAN_STATUS);
4545
String description = (String) properties.get(RouteConstants.SCAN_STATUS_DESC);
46+
String originOrgId = (String) properties.get(RouteConstants.ORIGIN_ORG_ID);
4647

4748
String scanType = (String) properties.get(RouteConstants.SCAN_TYPE);
4849
String orgId = ProcessorUtils.determineOrganizationId(eventPortalProperties, exchange);
@@ -56,7 +57,14 @@ public void process(Exchange exchange) throws Exception {
5657
topicDetails.put("scanType", scanType);
5758
topicDetails.put("status", status.name());
5859

59-
ScanStatusMessage generalStatusMessage = new ScanStatusMessage(orgId, scanId, traceId, actorId, status.name(), description, scanTypes);
60+
ScanStatusMessage generalStatusMessage = new ScanStatusMessage(orgId,
61+
originOrgId,
62+
scanId,
63+
traceId,
64+
actorId,
65+
status.name(),
66+
description,
67+
scanTypes);
6068

6169
exchange.getIn().setHeader(RouteConstants.GENERAL_STATUS_MESSAGE, generalStatusMessage);
6270
exchange.getIn().setHeader(RouteConstants.TOPIC_DETAILS, topicDetails);

‎service/application/src/main/java/com/solace/maas/ep/event/management/agent/processor/ScanStatusPerRouteProcessor.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,22 @@ public void process(Exchange exchange) throws Exception {
4141
ScanStatus status = (ScanStatus) properties.get(RouteConstants.SCAN_STATUS);
4242
String description = (String) properties.get(RouteConstants.SCAN_STATUS_DESC);
4343
String orgId = ProcessorUtils.determineOrganizationId(eventPortalProperties, exchange);
44+
String originOrgId = (String) properties.get(RouteConstants.ORIGIN_ORG_ID);
4445
topicDetails.put("orgId", orgId);
4546
topicDetails.put("runtimeAgentId", eventPortalProperties.getRuntimeAgentId());
4647
topicDetails.put("messagingServiceId", messagingServiceId);
4748
topicDetails.put("scanId", scanId);
4849
topicDetails.put("status", status.name());
4950
topicDetails.put("scanDataType", scanType);
5051

51-
ScanDataStatusMessage scanDataStatusMessage = new ScanDataStatusMessage(orgId, scanId, traceId, actorId,
52-
status.name(), description, scanType);
52+
ScanDataStatusMessage scanDataStatusMessage = new ScanDataStatusMessage(orgId,
53+
originOrgId,
54+
scanId,
55+
traceId,
56+
actorId,
57+
status.name(),
58+
description,
59+
scanType);
5360

5461
exchange.getIn().setHeader(RouteConstants.SCAN_DATA_STATUS_MESSAGE, scanDataStatusMessage);
5562
exchange.getIn().setHeader(RouteConstants.TOPIC_DETAILS, topicDetails);

0 commit comments

Comments
 (0)