From 0b5395bc2cd24fc7e1bbdbe6fc1aeae2f50f6012 Mon Sep 17 00:00:00 2001
From: "Holomek Christopher; BMW Group" <Christopher.Holomek@bmw.de>
Date: Thu, 8 Dec 2022 13:30:21 +0100
Subject: [PATCH] custom service for joynr triggers and their callbacks.

---
 .../custom-service-java.yaml                  | 37 ++++++++++++++----
 .../{template-1-1.json => joynrTrigger.json}  | 11 ++++--
 .../joynrTriggerCallback.json                 | 38 +++++++++++++++++++
 3 files changed, 75 insertions(+), 11 deletions(-)
 rename BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/{template-1-1.json => joynrTrigger.json} (54%)
 create mode 100644 BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json

diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml
index a58fde35..33b548ea 100644
--- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml
@@ -1,10 +1,31 @@
 config:
-- customService1: template-1-1.json
+- joynrTrigger: joynrTrigger.json
+- joynrTriggerCallback: joynrTriggerCallback.json
 
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- methodArgs: java.lang.Byte[],java.lang.String
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
+joynrTrigger:
+- name: AndroidJoynrTriggers
+- className: com.bmw.cc.apinext.processingsvc.service.VehicleStateControlEsi
+- methodName1: requestStateUpdate
+- argType1: java.lang.String
+- returnType1: void
+- methodName2: desiredStateUpdated
+- argType2: java.lang.String,java.lang.String
+- returnType2: void
+- skipDeployment: "false"
+
+joynrTriggerCallback:
+- name: AndroidJoynrTriggerCallbacks
+- className: com.bmw.cc.apinext.processingsvc.integration.joynr.stateless.callback.VehicleStateControlStatelessCallback
+- methodName1: requestStateUpdateSuccess
+- argType1: io.joynr.proxy.ReplyContext
+- returnType1: void
+- methodName2: requestStateUpdateFailed
+- argType2: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext
+- returnType2: void
+- methodName3: desiredStateUpdatedSuccess
+- argType3: io.joynr.proxy.ReplyContext
+- returnType3: void
+- methodName4: desiredStateUpdatedFailed
+- argType4: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext
+- returnType4: void
+- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json
similarity index 54%
rename from BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json
rename to BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json
index ebe95097..3391b9f2 100644
--- a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/template-1-1.json
+++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTrigger.json
@@ -13,9 +13,14 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": ["{{.methodArgs}}"],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
+     "argumentTypes": ["{{.argType1}}"],
+     "methodName": "{{.methodName1}}",
+     "returnType": "{{.returnType1}}"
+    },
+    {
+     "argumentTypes": ["{{.argType2}}"],
+     "methodName": "{{.methodName2}}",
+     "returnType": "{{.returnType2}}"
     }
    ]
   }
diff --git a/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json
new file mode 100644
index 00000000..852c5fab
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/joynrTriggerCallback.json
@@ -0,0 +1,38 @@
+{
+ "enabled": true,
+ "name": "{{.name}}",
+ "processGroups": [],
+ "queueEntryPoint": false,
+ "queueEntryPointType": null,
+ "rules": [
+  {
+   "annotations": [],
+   "className": "{{.className}}",
+   "enabled": true,
+   "fileName": "",
+   "matcher": "EQUALS",
+   "methodRules": [
+    {
+     "argumentTypes": ["{{.argType1}}"],
+     "methodName": "{{.methodName1}}",
+     "returnType": "{{.returnType1}}"
+    },
+    {
+     "argumentTypes": ["{{.argType2}}"],
+     "methodName": "{{.methodName2}}",
+     "returnType": "{{.returnType2}}"
+    },
+    {
+     "argumentTypes": ["{{.argType3}}"],
+     "methodName": "{{.methodName3}}",
+     "returnType": "{{.returnType3}}"
+    },
+    {
+     "argumentTypes": ["{{.argType4}}"],
+     "methodName": "{{.methodName4}}",
+     "returnType": "{{.returnType4}}"
+    }
+   ]
+  }
+ ]
+}
\ No newline at end of file