Pull request #320: Android App Distribution

Merge in OPAPM/cd_e2e_monitoring_config from feature/android-app-distribution to master

* commit 'dfff3116f4cbce50a8b159e151c8c45c488488f0':
  Fix issues with argument types in case multiple are used. I hope it works like this. Also add handle for cmdb auth so that service will be created

BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/custom-service-java.yaml

@@ -11,7 +11,7 @@ joynrTrigger:
 - argType1: java.lang.String
 - returnType1: void
 - methodName2: desiredStateUpdated
-- argType2: java.lang.String,java.lang.String
+- argType2: java.lang.String","java.lang.String
 - returnType2: void
 - skipDeployment: "false"
 
@@ -22,13 +22,13 @@ joynrTriggerCallback:
 - argType1: io.joynr.proxy.ReplyContext
 - returnType1: void
 - methodName2: requestStateUpdateFailed
-- argType2: io.joynr.exceptions.JoynrRuntimeException,io.joynr.proxy.ReplyContext
+- 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
+- argType4: io.joynr.exceptions.JoynrRuntimeException","io.joynr.proxy.ReplyContext
 - returnType4: void
 - skipDeployment: "false"
 
@@ -46,7 +46,10 @@ vsCmdbCallback:
 vsCmdbAuth:
 - name: AndroidVsCmdbAuth
 - className: com.bmw.cc.apinext.processingsvc.integration.vscmdb.kafka.AwsWebIdentityClientCallbackHandler
-- methodName1: onFailure
-- argType1: java.lang.Exception
+- methodName1: handle
+- argType1: javax.security.auth.callback.Callback[]
 - returnType1: void
+- methodName2: onFailure
+- argType2: java.lang.Exception
+- returnType2: void
 - skipDeployment: "false"

BMW-Dynatrace-config/CD_AppD_Android/custom-service-java/vsCmdbAuth.json

@@ -16,6 +16,11 @@
           "argumentTypes": ["{{.argType1}}"],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
+        },
+        {
+          "argumentTypes": ["{{.argType2}}"],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
         }
       ]
     }