Skip to content

Commit a8b58ab

Browse files
committed
Cleaning up pending task comments
1 parent 0ac5f8e commit a8b58ab

File tree

20 files changed

+3
-150
lines changed

20 files changed

+3
-150
lines changed

auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
@SdkPublicApi
3737
public final class InstanceProfileCredentialsProvider extends HttpCredentialsProvider {
3838

39-
//TODO: make this private
4039
private static final String SECURITY_CREDENTIALS_RESOURCE = "/latest/meta-data/iam/security-credentials/";
4140
private final ResourcesEndpointProvider credentialsEndpointProvider = new InstanceProviderCredentialsEndpointProvider();
4241

auth/src/main/java/software/amazon/awssdk/auth/signer/AwsSignerExecutionAttribute.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package software.amazon.awssdk.auth.signer;
1717

1818
import java.time.Instant;
19-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
2019
import software.amazon.awssdk.annotations.SdkProtectedApi;
2120
import software.amazon.awssdk.auth.credentials.AwsCredentials;
2221
import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
@@ -29,8 +28,6 @@
2928
* AWS-specific signing attributes attached to the execution. This information is available to {@link ExecutionInterceptor}s and
3029
* {@link Signer}s.
3130
*/
32-
@ReviewBeforeRelease("We should also consider making some of the SDK/AWS-owned set of attributes part of the immutable context"
33-
+ "if we don't want the interceptors to modify them.")
3431
@SdkProtectedApi
3532
public final class AwsSignerExecutionAttribute extends SdkExecutionAttribute {
3633
/**

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ protected final ShapeModel generateShapeModel(String javaClassName, String shape
124124
final List<String> enumValues = shape.getEnumValues();
125125
if (enumValues != null && !enumValues.isEmpty()) {
126126
for (String enumValue : enumValues) {
127-
// TODO handle useRealName if explicitly mentioned in
128-
// the customization.
129127
shapeModel.addEnum(
130128
new EnumModel(getNamingStrategy().getEnumValueName(enumValue), enumValue));
131129
}

codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final class DocumentationUtils {
3939
private static final String DEFAULT_FLUENT_RETURN =
4040
"Returns a reference to this object so that method calls can be chained together.";
4141

42-
//TODO kylthoms@: probably should move this to a custom config in each service
42+
//TODO probably should move this to a custom config in each service
4343
private static final Set<String> SERVICES_EXCLUDED_FROM_CROSS_LINKING = new HashSet<>(Arrays.asList(
4444
"apigateway", "budgets", "cloudsearch", "cloudsearchdomain",
4545
"discovery", "elastictranscoder", "es", "glacier", "importexport",

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ConstructorModel.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
4848
private String requestSignerClassFqcn;
4949

5050
private List<MemberModel> members;
51-
// Any constructor in addition to the default no-arg
52-
private List<ConstructorModel> additionalConstructors;
5351
private List<EnumModel> enums;
5452

5553
private VariableModel variable;
@@ -289,22 +287,6 @@ public void addMember(MemberModel member) {
289287
members.add(member);
290288
}
291289

292-
@JsonIgnore
293-
public List<ConstructorModel> getAdditionalConstructors() {
294-
return additionalConstructors;
295-
}
296-
297-
public void setAdditionalConstructors(List<ConstructorModel> additionalConstructors) {
298-
this.additionalConstructors = additionalConstructors;
299-
}
300-
301-
public void addConstructor(ConstructorModel constructor) {
302-
if (this.additionalConstructors == null) {
303-
this.additionalConstructors = new ArrayList<ConstructorModel>();
304-
}
305-
this.additionalConstructors.add(constructor);
306-
}
307-
308290
public List<EnumModel> getEnums() {
309291
return enums;
310292
}

codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtensions.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package software.amazon.awssdk.codegen.poet;
1717

1818
import com.squareup.javapoet.ClassName;
19-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
2019
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2120

2221
/**
@@ -69,7 +68,6 @@ public ClassName getClientClass(String className) {
6968
* Example: If operationName is "ListTables", then the response type of the paginated operation
7069
* will be "ListTablesIterable" class.
7170
*/
72-
@ReviewBeforeRelease("Naming of response shape for paginated APIs")
7371
public ClassName getResponseClassForPaginatedSyncOperation(String operationName) {
7472
return ClassName.get(model.getMetadata().getFullPaginatorsPackageName(), operationName + "Iterable");
7573
}
@@ -81,7 +79,6 @@ public ClassName getResponseClassForPaginatedSyncOperation(String operationName)
8179
* Example: If operationName is "ListTables", then the async response type of the paginated operation
8280
* will be "ListTablesPublisher" class.
8381
*/
84-
@ReviewBeforeRelease("Naming of response shape for paginated APIs")
8582
public ClassName getResponseClassForPaginatedAsyncOperation(String operationName) {
8683
return ClassName.get(model.getMetadata().getFullPaginatorsPackageName(), operationName + "Publisher");
8784
}

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceModelCopiers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public Optional<ClassName> copierClassFor(MemberModel memberModel) {
7171
return Optional.of(ClassName.get(StandardMemberCopier.class));
7272
}
7373

74-
// FIXME: Ugly hack, but some services (Health) have shapes with names
74+
// FIXME: Some services (Health) have shapes with names
7575
// that differ only in the casing of the first letter, and generating
7676
// classes for them breaks on case insensitive filesystems...
7777
String shapeName = memberModel.getC2jShape();

codegen/src/main/java/software/amazon/awssdk/codegen/utils/PaginatorUtils.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
package software.amazon.awssdk.codegen.utils;
1717

18-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
19-
2018
public final class PaginatorUtils {
2119

2220
private PaginatorUtils() {
@@ -26,7 +24,6 @@ private PaginatorUtils() {
2624
* @param methodName Name of a method in sync client
2725
* @return the name of the auto-pagination enabled operation
2826
*/
29-
@ReviewBeforeRelease("Naming of paginated APIs")
3027
public static String getPaginatedMethodName(String methodName) {
3128
return methodName + "Paginator";
3229
}

core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private boolean shouldPutParamsInBody(SdkHttpFullRequest.Builder input,
5151
!CollectionUtils.isNullOrEmpty(input.rawQueryParameters());
5252
}
5353

54-
// TODO FIXME hacky hack
54+
// TODO FIXME
5555
@ReviewBeforeRelease("SigV2 expects query params to be signed as query params despite being in the body. Moving" +
5656
" before signing breaks SimpleDB which still uses SigV2. Probably the best thing to do is" +
5757
" make the SigV2 signer be aware that params are being moved into the body and move them back out" +

core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package software.amazon.awssdk.core.internal.http.pipeline.stages;
1717

18-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
1918
import software.amazon.awssdk.annotations.SdkInternalApi;
2019
import software.amazon.awssdk.core.http.ExecutionContext;
2120
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -76,8 +75,6 @@ private void updateInterceptorContext(SdkHttpFullRequest request, ExecutionConte
7675
*
7776
* @return True if request should be signed, false if not.
7877
*/
79-
@ReviewBeforeRelease("add back credential check (credentials != null || signer instanceof CanHandleNullCredentials) when "
80-
+ "refactoring signer")
8178
private boolean shouldSign(Signer signer) {
8279
return signer != null;
8380
}

core/src/main/java/software/amazon/awssdk/core/pagination/async/SdkPublisher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
@SdkPublicApi
2727
public interface SdkPublisher<T> extends Publisher<T> {
2828

29-
// TODO Should we return the last response instead of Void?
3029
default CompletableFuture<Void> forEach(Consumer<T> consumer) {
3130
CompletableFuture<Void> future = new CompletableFuture<>();
3231
subscribe(new SequentialSubscriber<>(consumer, future));

core/src/main/java/software/amazon/awssdk/core/util/ComparableUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
package software.amazon.awssdk.core.util;
1717

1818
import java.util.stream.Stream;
19-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
2019
import software.amazon.awssdk.annotations.SdkProtectedApi;
2120

22-
@ReviewBeforeRelease("We should consider migrating this and other related util classes to the utils package.")
2321
@SdkProtectedApi
2422
public final class ComparableUtils {
2523
private ComparableUtils() {}

services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/BaseResultIntegrationTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.junit.Before;
2121
import org.junit.Test;
22-
import software.amazon.awssdk.annotations.ReviewBeforeRelease;
2322
import software.amazon.awssdk.regions.Region;
2423
import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
2524
import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
@@ -38,15 +37,13 @@ public void setup() {
3837
}
3938

4039
@Test
41-
@ReviewBeforeRelease("Response metadata has been broken by client/interface refactoring. Fix before release")
4240
public void responseMetadataInBaseResultIsSameAsMetadataCache() {
4341
ListTablesRequest request = ListTablesRequest.builder().build();
4442
ListTablesResponse result = dynamoDB.listTables(request);
4543
assertThat(result.sdkHttpResponse().headers()).isNotNull();
4644
}
4745

4846
@Test
49-
@ReviewBeforeRelease("Response metadata has been broken by client/interface refactoring. Fix before release")
5047
public void httpMetadataInBaseResultIsValid() {
5148
ListTablesResponse result = dynamoDB.listTables(ListTablesRequest.builder().build());
5249
assertThat(result.sdkHttpResponse().statusCode()).isEqualTo(200);

services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.junit.Assert.assertTrue;
2020

2121
import org.junit.Before;
22-
import org.junit.Ignore;
2322
import org.junit.Test;
2423
import software.amazon.awssdk.auth.credentials.AwsCredentials;
2524
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -36,7 +35,6 @@ public void setup() {
3635
}
3736

3837
@Test
39-
@Ignore // FIXME: Fails with "region cannot be null"
4038
public void clientCreatedWithConstructor_RegistersGlobalHandlers() {
4139
assertFalse(TestGlobalExecutionInterceptor.wasCalled());
4240
DynamoDbClient client = DynamoDbClient.builder()
@@ -48,7 +46,6 @@ public void clientCreatedWithConstructor_RegistersGlobalHandlers() {
4846
}
4947

5048
@Test
51-
@Ignore // FIXME: Fails with "region cannot be null"
5249
public void clientCreatedWithBuilder_RegistersGlobalHandlers() {
5350
assertFalse(TestGlobalExecutionInterceptor.wasCalled());
5451
DynamoDbClient client = DynamoDbClient.builder()

test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ExpectedTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121
import java.util.Map.Entry;
2222
import org.junit.Assert;
23-
import org.junit.Ignore;
2423
import org.junit.Test;
2524
import software.amazon.awssdk.regions.Region;
2625
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -295,7 +294,6 @@ public void testExpected_EmptyAttributeName() {
295294
}
296295

297296
@Test
298-
@Ignore // FIXME: failes with "region cannot be null"
299297
public void testExpected_DuplicateAttribute() {
300298
Table fakeTable = new Table(DynamoDbClient.builder().region(Region.US_WEST_2).build(), "fake-table");
301299
try {

test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/FilterConditionTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121
import java.util.Map.Entry;
2222
import org.junit.Assert;
23-
import org.junit.Ignore;
2423
import org.junit.Test;
2524
import software.amazon.awssdk.regions.Region;
2625
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -268,7 +267,6 @@ public void testScanFilter_EmptyAttributeName() {
268267
}
269268

270269
@Test
271-
@Ignore // FIXME: fails with "region cannot be null"
272270
public void testScanFilter_DuplicateAttribute() {
273271
Table fakeTable = new Table(DynamoDbClient.builder().region(Region.US_WEST_2).build(), "fake-table");
274272
try {

test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Collection;
2424
import java.util.List;
2525
import org.junit.BeforeClass;
26-
import org.junit.Ignore;
2726
import org.junit.Test;
2827
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
2928
import software.amazon.awssdk.regions.Region;
@@ -42,7 +41,6 @@
4241
/**
4342
* Tests on the DynamoDBMapper.generateCreateTableRequest method.
4443
*/
45-
@Ignore // FIXME: setup fails with "region cannot be null"
4644
public class GenerateCreateTableRequestTest extends DynamoDBTestBase {
4745

4846
private static DynamoDbMapper mapper;

test/test-utils/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@
6767
<groupId>com.fasterxml.jackson.core</groupId>
6868
<artifactId>jackson-databind</artifactId>
6969
</dependency>
70-
<dependency>
71-
<groupId>com.fasterxml.jackson.core</groupId>
72-
<artifactId>jackson-annotations</artifactId>
73-
</dependency>
7470
<dependency>
7571
<groupId>log4j</groupId>
7672
<artifactId>log4j</artifactId>

test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/ObjectMapperSingleton.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)