Skip to content

Commit 410f8ad

Browse files
committed
Revert "Merge pull request #1187 from aws/finks/unsupported-payloads"
This reverts commit fd18eaf, reversing changes made to 310bad2.
1 parent 53c2655 commit 410f8ad

File tree

8 files changed

+20
-799
lines changed

8 files changed

+20
-799
lines changed

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
import static software.amazon.awssdk.codegen.RemoveUnusedShapes.removeUnusedShapes;
2020

2121
import java.util.ArrayList;
22-
import java.util.Arrays;
2322
import java.util.Collections;
2423
import java.util.HashMap;
2524
import java.util.List;
2625
import java.util.Map;
2726
import java.util.TreeMap;
28-
import java.util.stream.Collectors;
2927
import org.slf4j.Logger;
3028
import org.slf4j.LoggerFactory;
3129
import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
@@ -55,8 +53,6 @@
5553
*/
5654
public class IntermediateModelBuilder {
5755

58-
private static final List<String> NO_BODY_METHODS = Arrays.asList("GET", "HEAD", "DELETE");
59-
6056
private static final Logger log = LoggerFactory.getLogger(IntermediateModelBuilder.class);
6157
private final CustomizationConfig customConfig;
6258
private final ServiceModel service;
@@ -161,28 +157,9 @@ public IntermediateModel build() {
161157

162158
setSimpleMethods(trimmedModel);
163159

164-
validateOperations(trimmedModel);
165-
166160
return trimmedModel;
167161
}
168162

169-
/**
170-
* Validates that operations that use GET, DELETE or HEAD do not have an HTTP body.
171-
*/
172-
private void validateOperations(IntermediateModel model) {
173-
List<String> methods = model.getOperations()
174-
.values()
175-
.stream()
176-
.filter(e -> e.getInputShape().hasPayloadMembers())
177-
.filter(e -> NO_BODY_METHODS.contains(e.getInputShape().getMarshaller().getVerb()))
178-
.map(e -> e.getInputShape().getC2jName())
179-
.collect(Collectors.toList());
180-
181-
if (methods.size() > 0) {
182-
throw new RuntimeException("An HTTP body is not allowed on GET/DELETE/HEAD requests. Invalid operations: " + methods);
183-
}
184-
}
185-
186163
/**
187164
* Link the member to it's corresponding shape (if it exists).
188165
*

codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java

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

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/unsupportedpayloads/customization.config

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

0 commit comments

Comments
 (0)