From 205c475866484274979c2d27068d63f6ba15d5e4 Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Mon, 13 Jun 2022 11:00:28 +0200
Subject: [PATCH] tsrd SQS/MQS/TIMER - without new SQSQuitDiagnosisTsrd

---
 .../custom-service-java.yaml                  | 34 ++++++++++++-
 .../custom-service-java/template-1-1.json     | 51 +++++++------------
 .../custom-service-java/template-2-1.json     | 36 +++++++++++++
 3 files changed, 87 insertions(+), 34 deletions(-)
 create mode 100644 BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-2-1.json

diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index a10649bd..8027a3d8 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -1,5 +1,8 @@
 config:
-- customService1: template-1-1.json
+- customService1: template-2-1.json
+- customService2: template-1-1.json
+- customService3: template-1-1.json
+- customService4: template-2-1.json
 
 customService1:
 - name: "ifs-006 (JOYNR) enable/disableFullDiagnosticsMode - OUT"
@@ -11,4 +14,31 @@ customService1:
 - methodName2: disableFullDiagnosticsMode
 - methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId
 - returnType2: void
-- skipDeployment: "false"
\ No newline at end of file
+- skipDeployment: "false"
+
+customService2:
+- name: "(MQS) CallTopic - OUT"
+- className1: com.bmw.cc.ts.tsrd.bm.jms.calltopic.boundary.CallTopicJmsPublisherBA
+- methodName1: publishCallToCallTopic
+- methodArgs1: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
+- returnType1: void
+
+customService3:
+- name: "ifs-007 (SQS) odfUpdateStatus - IN"
+- className1: com.bmw.cc.ts.tsrd.bm.odfupdatestatus.boundary.OdfUpdateStatusSqsMF
+- methodName1: processMessage
+- methodArgs1: software.amazon.awssdk.services.sqs.model.Message
+- returnType1: void
+
+
+- customService4: 
+- name: "(Timer) deletion/timeout"
+- className1: com.bmw.cc.ts.tsrd.bm.timer.DatabaseCleanerTimerService
+- methodName1: timeout
+- methodArgs1: javax.ejb.Timer
+- returnType1: void
+- className2: com.bmw.cc.ts.tsrd.bm.timer.RDTimeoutTimer
+- methodName2: timeout
+- methodArgs2: javax.ejb.Timer
+- returnType2: void
+- skipDeployment: "false"
diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-1-1.json
index f0077b0c..ebe95097 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-1-1.json
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-1-1.json
@@ -1,36 +1,23 @@
 {
-  "enabled": true,
-  "name": "{{.name}}",
-  "processGroups": [],
-  "queueEntryPoint": false,
-  "queueEntryPointType": null,
-  "rules": [
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
     {
-      "annotations": [],
-      "className": "{{.className1}}",
-      "enabled": true,
-      "fileName": "",
-      "matcher": "EQUALS",
-      "methodRules": [
-        {
-          "argumentTypes": ["{{.methodArgs1}}"],
-          "methodName": "{{.methodName1}}",
-          "returnType": "{{.returnType1}}"
-        }]
-    },
-    {
-      "annotations": [],
-      "className": "{{.className2}}",
-      "enabled": true,
-      "fileName": "",
-      "matcher": "EQUALS",
-      "methodRules": [
-        {
-          "argumentTypes": ["{{.methodArgs2}}"],
-          "methodName": "{{.methodName2}}",
-          "returnType": "{{.returnType2}}"
-        }
-      ]
+     "argumentTypes": ["{{.methodArgs}}"],
+     "methodName": "{{.methodName}}",
+     "returnType": "{{.returnType}}"
     }
-  ]
+   ]
+  }
+ ]
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-2-1.json
new file mode 100644
index 00000000..f0077b0c
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/template-2-1.json
@@ -0,0 +1,36 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className1}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs1}}"],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs2}}"],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file