From 16c45dd5f04e9d7313374b9743491d6111924afe Mon Sep 17 00:00:00 2001 From: Bernd Brandl Date: Mon, 13 Jun 2022 09:27:08 +0200 Subject: [PATCH] SQS/MQS ts-asc --- .../custom-service-java.yaml | 23 +++++++++---------- .../custom-service-java/template-1-1.json | 6 +---- .../custom-service-java/template-2-1.json | 9 ++------ ...n => template-2-2-without-methodargs.json} | 8 +++---- 4 files changed, 18 insertions(+), 28 deletions(-) rename BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/{template-1-2.json => template-2-2-without-methodargs.json} (81%) diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml index 87745cc7..c7e31b68 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/custom-service-java.yaml @@ -1,35 +1,34 @@ config: -- customService1: template-1-2.json +- customService1: template-2-2-without-methodargs.json - customService2: template-2-1.json - customService3: template-1-1.json customService1: -- name: VDLM_ts-asc - (Timer) deletion/timeout -- className: com.bmw.cc.asc.bm.boundary.TimerBF +- name: (Timer) deletion/timeout +- className1: com.bmw.cc.asc.bm.boundary.TimerBF - methodName1: executeDeletionJob - returnType1: void -# - argumentTypes1: +- className2: com.bmw.cc.asc.bm.boundary.TimerBF - methodName2: executeTimeoutJob - returnType2: void -# - argumentTypes2: - skipDeployment: "false" customService2: -- name: VDLM_ts-asc - ifs-001 (SQS) AscIn/AscOut - IN/OUT -- className1: com.bmw.cc.asc.bm.boundary.TeleXBF -- methodName1: handleTeleXMessage +- name: ifs-001 (SQS) AscIn/Out - IN/OUT +- className1: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsListener +- methodName1: onSqsMessage - returnType1: void -# - argumentTypes1: +- methodArgs1: java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String - className2: com.bmw.cc.asc.integration.sqs.boundary.TeleXSqsESI - methodName2: send - returnType2: void -# - argumentTypes2: +- methodArgs2: java.lang.String,java.util.Map - skipDeployment: "false" customService3: -- name: VDLM_ts-asc - (MQS) CallTopic - OUT +- name: (MQS) CallTopic - OUT - className: com.bmw.cc.asc.integration.jms.boundry.CallTopicJmsESI - methodName: send - returnType: void -# - argumentTypes: +- methodArgs: java.lang.String,com.bmw.cc.tscs.enums.CallState,com.bmw.cc.asc.bm.entity.Call - skipDeployment: "false" diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-1.json index a50c1a24..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-1.json @@ -13,11 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String", - "com.bmw.cc.tscs.enums.CallState", - "com.bmw.cc.asc.bm.entity.Call" - ], + "argumentTypes": ["{{.methodArgs}}"], "methodName": "{{.methodName}}", "returnType": "{{.returnType}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json index 18dd391c..f0077b0c 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-1.json @@ -13,9 +13,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "com.bmw.cc.asc.integration.sqs.entity.TeleXMessageData" - ], + "argumentTypes": ["{{.methodArgs1}}"], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] @@ -28,10 +26,7 @@ "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ - "java.lang.String", - "java.util.Map" - ], + "argumentTypes": ["{{.methodArgs2}}"], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-2-without-methodargs.json similarity index 81% rename from BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json rename to BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-2-without-methodargs.json index 9d13d592..7ed95c38 100644 --- a/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-1-2.json +++ b/BMW-Dynatrace-config/CD_VDLM_ts-asc/custom-service-java/template-2-2-without-methodargs.json @@ -7,26 +7,26 @@ "rules": [ { "annotations": [], - "className": "{{.className}}", + "className": "{{.className1}}", "enabled": true, "fileName": "", "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ ], + "argumentTypes": [], "methodName": "{{.methodName1}}", "returnType": "{{.returnType1}}" }] }, { "annotations": [], - "className": "{{.className}}", + "className": "{{.className2}}", "enabled": true, "fileName": "", "matcher": "EQUALS", "methodRules": [ { - "argumentTypes": [ ], + "argumentTypes": [], "methodName": "{{.methodName2}}", "returnType": "{{.returnType2}}" }