Skip to content

Commit 70daf4e

Browse files
committed
spotless run
1 parent 3c0acac commit 70daf4e

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public void assertRequestWithMockedResponse(
118118
if (att.getType() == AttributeType.STRING) {
119119
attributes.add(equalTo(att.getStringKey(), att.getStringVal()));
120120
} else if (att.getType() == AttributeType.STRING_ARRAY) {
121-
attributes.add(equalTo(att.getStringArrayKey(), att.getStringArrayVal()));
121+
attributes.add(
122+
equalTo(att.getStringArrayKey(), att.getStringArrayVal()));
122123
}
123124
});
124125

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

8+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringArrayKeyPair;
9+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
10+
811
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
912
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
1013
import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
1114
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
1215
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
1316
import io.opentelemetry.testing.internal.armeria.common.MediaType;
14-
import org.junit.jupiter.api.Test;
1517
import java.util.Arrays;
1618
import java.util.Collections;
1719
import java.util.List;
18-
19-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringArrayKeyPair;
20-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
20+
import org.junit.jupiter.api.Test;
2121

2222
public abstract class AbstractDynamoDbClientTest extends AbstractBaseAwsClientTest {
2323

@@ -41,19 +41,14 @@ public void sendRequestWithMockedResponse() throws Exception {
4141

4242
List<String> tableList = Collections.singletonList("sometable");
4343

44-
List<AttributeKeyPair<?>> additionalAttributes = Arrays.asList(
45-
createStringKeyPair("aws.table.name", "sometable"),
46-
createStringKeyPair("db.system", "dynamodb"),
47-
createStringArrayKeyPair("aws.dynamodb.table_names", tableList)
48-
);
44+
List<AttributeKeyPair<?>> additionalAttributes =
45+
Arrays.asList(
46+
createStringKeyPair("aws.table.name", "sometable"),
47+
createStringKeyPair("db.system", "dynamodb"),
48+
createStringArrayKeyPair("aws.dynamodb.table_names", tableList));
4949

5050
Object response = client.createTable(new CreateTableRequest("sometable", null));
5151
assertRequestWithMockedResponse(
52-
response,
53-
client,
54-
"DynamoDBv2",
55-
"CreateTable",
56-
"POST",
57-
additionalAttributes);
52+
response, client, "DynamoDBv2", "CreateTable", "POST", additionalAttributes);
5853
}
5954
}

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractKinesisClientTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

8+
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
9+
810
import com.amazonaws.services.kinesis.AmazonKinesis;
911
import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
1012
import com.amazonaws.services.kinesis.model.DeleteStreamRequest;
11-
1213
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
1314
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
1415
import io.opentelemetry.testing.internal.armeria.common.MediaType;
@@ -20,8 +21,6 @@
2021
import org.junit.jupiter.params.provider.Arguments;
2122
import org.junit.jupiter.params.provider.MethodSource;
2223

23-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
24-
2524
public abstract class AbstractKinesisClientTest extends AbstractBaseAwsClientTest {
2625

2726
public abstract AmazonKinesisClientBuilder configureClient(AmazonKinesisClientBuilder client);
@@ -45,9 +44,8 @@ public void testSendRequestWithMockedResponse(
4544

4645
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, ""));
4746

48-
List<AttributeKeyPair<?>> additionalAttributes = Arrays.asList(
49-
createStringKeyPair("aws.stream.name", "somestream")
50-
);
47+
List<AttributeKeyPair<?>> additionalAttributes =
48+
Arrays.asList(createStringKeyPair("aws.stream.name", "somestream"));
5149
Object response = call.apply(client);
5250
assertRequestWithMockedResponse(
5351
response, client, "Kinesis", operation, "POST", additionalAttributes);

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSnsClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void testSendRequestWithMockedResponse(Function<AmazonSNS, Object> call)
5353

5454
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
5555

56-
List<AttributeKeyPair<?>> additionalAttributes = Arrays.asList(
57-
createStringKeyPair(MESSAGING_DESTINATION_NAME.toString(), "somearn"));
56+
List<AttributeKeyPair<?>> additionalAttributes =
57+
Arrays.asList(createStringKeyPair(MESSAGING_DESTINATION_NAME.toString(), "somearn"));
5858

5959
Object response = call.apply(client);
6060
assertRequestWithMockedResponse(

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AttributeKeyPair.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.awssdk.v1_11;
27

38
import groovyjarjarantlr4.v4.runtime.misc.Nullable;
@@ -19,7 +24,8 @@ public static AttributeKeyPair<String> createStringKeyPair(String keyString, Str
1924
return new AttributeKeyPair<>(AttributeKey.stringKey(keyString), val);
2025
}
2126

22-
public static AttributeKeyPair<List<String>> createStringArrayKeyPair(String keyString, List<String> val) {
27+
public static AttributeKeyPair<List<String>> createStringArrayKeyPair(
28+
String keyString, List<String> val) {
2329
return new AttributeKeyPair<>(AttributeKey.stringArrayKey(keyString), val);
2430
}
2531

@@ -29,7 +35,7 @@ public AttributeType getType() {
2935

3036
@SuppressWarnings("unchecked")
3137
public AttributeKey<String> getStringKey() {
32-
if (key.getType() != AttributeType.STRING){
38+
if (key.getType() != AttributeType.STRING) {
3339
return null;
3440
}
3541
return (AttributeKey<String>) key;
@@ -45,19 +51,19 @@ public AttributeKey<List<String>> getStringArrayKey() {
4551
}
4652

4753
@SuppressWarnings("unchecked")
48-
public String getStringVal(){
49-
if (key.getType() != AttributeType.STRING){
54+
public String getStringVal() {
55+
if (key.getType() != AttributeType.STRING) {
5056
return null;
5157
}
5258
return (String) value;
5359
}
5460

5561
@SuppressWarnings("unchecked")
5662
@Nullable
57-
public List<String> getStringArrayVal(){
58-
if (key.getType() != AttributeType.STRING_ARRAY){
63+
public List<String> getStringArrayVal() {
64+
if (key.getType() != AttributeType.STRING_ARRAY) {
5965
return null;
6066
}
61-
return (List<String>)value;
67+
return (List<String>) value;
6268
}
6369
}

0 commit comments

Comments
 (0)