From 2e36c323af7e681e5383b483956dc888469562fa Mon Sep 17 00:00:00 2001
From: Bernd Brandl <bernd.brandl@bmw.de>
Date: Mon, 9 May 2022 09:52:00 +0200
Subject: [PATCH] added scallservice JoyNr argumentTypes

---
 .../custom-service-java.yaml                  | 22 +++++++++---
 .../custom-service-java/template-1-1.json     |  2 +-
 .../custom-service-java/template-1-2.json     | 36 +++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json

diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
index 200ac4c3..f19e7fbe 100644
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
@@ -1,9 +1,21 @@
 config:
-- customService1: template-1-1.json
+- customService1: template-1-2.json
+- customService2: template-1-1.json
 
 customService1:
-- name: "VDLM_scallservice - ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
-- className: com.bmw.cc.ts.scallservice.bm.maintenance.boundary.MaintenanceConfirmBF
-- methodName: notifyMaintenanceStatus
-- returnType: void
+- name: "VDLM_scallservice - ifs-002 (JOYNR) requestMaintenanceStatus/confirmMaintenanceStatus - OUT"
+- className: com.bmw.cc.ts.scallservice.joynr.consumer.boundary.SCallServiceV1Consumer
+- methodName1: confirmMaintenanceStatus
+- returnType1: void
+- methodName2: requestMaintenanceStatus
+- returnType2: void
 - skipDeployment: "false"
+
+
+customService2:
+  - name: "VDLM_scallservice - ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
+  - className: com.bmw.cc.ts.scallservice.bm.maintenance.boundary.MaintenanceConfirmBF
+  - methodName: notifyMaintenanceStatus
+  - returnType: void
+  - skipDeployment: "false"
+
diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json
index b3003515..4ab1ee81 100644
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json
@@ -13,7 +13,7 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": [],
+     "argumentTypes": ["com.bmw.cc.ts.joynr.consumer.entity.NotifyMaintenanceVehicleResponse"],
      "methodName": "{{.methodName}}",
      "returnType": "{{.returnType}}"
     }
diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json
new file mode 100644
index 00000000..b3b7224f
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json
@@ -0,0 +1,36 @@
+{
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
+    {
+      "annotations": [],
+      "className": "{{.className}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode"],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": [ "joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId" ],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file