Skip to content

Commit 164402b

Browse files
committed
testing changes
1 parent 221d9a2 commit 164402b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,14 @@ public static void cleanupAlarms() {
9696
DescribeAlarmsResponse describeResult = cloudwatch.describeAlarms(DescribeAlarmsRequest.builder().build());
9797
Collection<String> toDelete = new LinkedList<>();
9898
for (MetricAlarm alarm : describeResult.metricAlarms()) {
99-
if (alarm.metricName().startsWith(CloudWatchIntegrationTest.class.getName())) {
99+
// TODO - null for some Catapult alarms
100+
// Also other existing Catapult alarms we DON'T want to delete
101+
String metricName = alarm.metricName();
102+
if (metricName == null || metricName.startsWith("Catapult-Java2")) {
103+
continue;
104+
}
105+
//
106+
if (metricName.startsWith(CloudWatchIntegrationTest.class.getName())) {
100107
toDelete.add(alarm.alarmName());
101108
}
102109
}

services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Uri.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* parameters with special characters, they must be URL-encoded, e.g., replace " " with "%20". If you work with
4141
* virtual-hosted-style URIs with bucket names that contain a dot, i.e., ".", the dot must not be URL-encoded. Encoded buckets,
4242
* keys, and query parameters will be returned decoded.
43-
* $$ DUMMY CHANGE $$
43+
* $$ DUMMY CHANGE $$$$
4444
*/
4545
@Immutable
4646
@SdkPublicApi

0 commit comments

Comments
 (0)