From fd51da8cae1ded3977a3f16a45c3bc18dea5a3c3 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien.vanroy@gmail.com>
Date: Thu, 11 Feb 2021 16:04:59 +0100
Subject: [PATCH] Fix response parsing error on Java SDK v2 for CW
 GetMetricData (#3645) (#3675)

Co-authored-by: Julien Roy <julien@bankin.com>
---
 moto/cloudformation/responses.py |  3 ++-
 moto/cloudwatch/responses.py     | 21 ++++++++++-----------
 moto/ses/responses.py            |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/moto/cloudformation/responses.py b/moto/cloudformation/responses.py
index 6d2af655d..e9cb35920 100644
--- a/moto/cloudformation/responses.py
+++ b/moto/cloudformation/responses.py
@@ -1108,7 +1108,8 @@ STOP_STACK_SET_OPERATION_RESPONSE_TEMPLATE = """<StopStackSetOperationResponse x
   <StopStackSetOperationResult/>
   <ResponseMetadata>
     <RequestId>2188554a-07c6-4396-b2c5-example</RequestId>
-  </ResponseMetadata>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     </StopStackSetOperationResponse>
+  </ResponseMetadata>
+</StopStackSetOperationResponse>
 """
 
 DESCRIBE_STACKSET_OPERATION_RESPONSE_TEMPLATE = (
diff --git a/moto/cloudwatch/responses.py b/moto/cloudwatch/responses.py
index f3430052a..063dff8b6 100644
--- a/moto/cloudwatch/responses.py
+++ b/moto/cloudwatch/responses.py
@@ -455,11 +455,6 @@ PUT_METRIC_DATA_TEMPLATE = """<PutMetricDataResponse xmlns="http://monitoring.am
 </PutMetricDataResponse>"""
 
 GET_METRIC_DATA_TEMPLATE = """<GetMetricDataResponse xmlns="http://monitoring.amazonaws.com/doc/2010-08-01/">
-   <ResponseMetadata>
-      <RequestId>
-         {{ request_id }}
-      </RequestId>
-   </ResponseMetadata>
    <GetMetricDataResult>
        <MetricDataResults>
            {% for result in results %}
@@ -481,15 +476,14 @@ GET_METRIC_DATA_TEMPLATE = """<GetMetricDataResponse xmlns="http://monitoring.am
             {% endfor %}
        </MetricDataResults>
    </GetMetricDataResult>
+   <ResponseMetadata>
+       <RequestId>
+            {{ request_id }}
+       </RequestId>
+   </ResponseMetadata>
 </GetMetricDataResponse>"""
 
 GET_METRIC_STATISTICS_TEMPLATE = """<GetMetricStatisticsResponse xmlns="http://monitoring.amazonaws.com/doc/2010-08-01/">
-   <ResponseMetadata>
-      <RequestId>
-         {{ request_id }}
-      </RequestId>
-   </ResponseMetadata>
-
   <GetMetricStatisticsResult>
       <Label>{{ label }}</Label>
       <Datapoints>
@@ -525,6 +519,11 @@ GET_METRIC_STATISTICS_TEMPLATE = """<GetMetricStatisticsResponse xmlns="http://m
         {% endfor %}
       </Datapoints>
     </GetMetricStatisticsResult>
+    <ResponseMetadata>
+      <RequestId>
+        {{ request_id }}
+      </RequestId>
+    </ResponseMetadata>
 </GetMetricStatisticsResponse>"""
 
 LIST_METRICS_TEMPLATE = """<ListMetricsResponse xmlns="http://monitoring.amazonaws.com/doc/2010-08-01/">
diff --git a/moto/ses/responses.py b/moto/ses/responses.py
index 703cd2e7a..93bf5f4f3 100644
--- a/moto/ses/responses.py
+++ b/moto/ses/responses.py
@@ -341,10 +341,10 @@ GET_SEND_STATISTICS = """<GetSendStatisticsResponse xmlns="http://ses.amazonaws.
             </item>
         {% endfor %}
       </SendDataPoints>
-      <ResponseMetadata>
-        <RequestId>e0abcdfa-c866-11e0-b6d0-273d09173z49</RequestId>
-      </ResponseMetadata>
   </GetSendStatisticsResult>
+  <ResponseMetadata>
+    <RequestId>e0abcdfa-c866-11e0-b6d0-273d09173z49</RequestId>
+  </ResponseMetadata>
 </GetSendStatisticsResponse>"""
 
 CREATE_CONFIGURATION_SET = """<CreateConfigurationSetResponse xmlns="http://ses.amazonaws.com/doc/2010-12-01/">