Revert "Add support for event stream requests over RPC"

This reverts commit 8763931.

Author: dagnir

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

@@ -232,7 +232,6 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                .add(".withMarshaller($L)\n", asyncMarshaller(model, opModel, marshaller, protocolFactory))
                .add(asyncRequestBody(opModel))
                .add(fullDuplex(opModel))
-               .add(hasInitialRequestEvent(opModel, isRestJson))
                .add(".withResponseHandler($L)\n", responseHandlerName(opModel, isRestJson))
                .add(".withErrorResponseHandler(errorResponseHandler)\n")
                .add(".withMetricCollector(apiCallMetricCollector)\n")
@@ -272,11 +271,6 @@ private CodeBlock fullDuplex(OperationModel opModel) {
                                                                                : CodeBlock.of("");
     }
 
-    private CodeBlock hasInitialRequestEvent(OperationModel opModel, boolean isRestJson) {
-        return opModel.hasEventStreamInput() && !isRestJson ? CodeBlock.of(".withInitialRequestEvent(true)")
-                                                            : CodeBlock.of("");
-    }
-
     private CodeBlock asyncRequestBody(OperationModel opModel) {
         return opModel.hasEventStreamInput() ? CodeBlock.of(".withAsyncRequestBody($T.fromPublisher(adapted))",
                                                             AsyncRequestBody.class)

codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java

@@ -32,6 +32,8 @@
  */
 public final class EventStreamJsonMarshallerSpec extends JsonMarshallerSpec {
 
+    private static final String JSON_CONTENT_TYPE = "application/json";
+
     public EventStreamJsonMarshallerSpec(IntermediateModel model, ShapeModel shapeModel) {
         super(shapeModel);
     }
@@ -49,7 +51,7 @@ public CodeBlock marshalCodeBlock(ClassName requestClassName) {
 
         // Add :content-type header only if payload is present
         if (!shapeModel.hasNoEventPayload()) {
-            builder.add(".putHeader(\":content-type\", $L)", determinePayloadContentType());
+            builder.add(".putHeader(\":content-type\", \"$L\")", determinePayloadContentType());
         }
 
         builder.add(".build();");
@@ -83,12 +85,12 @@ private String determinePayloadContentType() {
             return getPayloadContentType(explicitEventPayload);
         }
 
-        return "protocolFactory.getContentType()";
+        return JSON_CONTENT_TYPE;
     }
 
     private String getPayloadContentType(MemberModel memberModel) {
-        String blobContentType = "\"application/octet-stream\"";
-        String stringContentType = "\"text/plain\"";
+        String blobContentType = "application/octet-stream";
+        String stringContentType = "text/plain";
         String variableType = memberModel.getVariable().getVariableType();
 
         if ("software.amazon.awssdk.core.SdkBytes".equals(variableType)) {
@@ -97,6 +99,6 @@ private String getPayloadContentType(MemberModel memberModel) {
             return stringContentType;
         }
 
-        return "protocolFactory.getContentType()";
+        return JSON_CONTENT_TYPE;
     }
 }

codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

@@ -16,8 +16,6 @@
 package software.amazon.awssdk.codegen.poet;
 
 import java.io.File;
-
-import org.eclipse.core.runtime.internal.adaptor.IModel;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -33,20 +31,7 @@
 public class ClientTestModels {
     private ClientTestModels() {}
 
-    public static IntermediateModel awsJsonServiceModels() {
-        File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/json/service-2.json").getFile());
-        File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/json/customization.config").getFile());
-        File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/json/paginators.json").getFile());
-        C2jModels models = C2jModels.builder()
-            .serviceModel(getServiceModel(serviceModel))
-            .customizationConfig(getCustomizationConfig(customizationModel))
-            .paginatorsModel(getPaginatorsModel(paginatorsModel))
-            .build();
-
-        return new IntermediateModelBuilder(models).build();
-    }
-
-    public static IntermediateModel restJsonServiceModels() {
+    public static IntermediateModel jsonServiceModels() {
         File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/service-2.json").getFile());
         File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/customization.config").getFile());
         File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/rest-json/paginators.json").getFile());

codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java

@@ -69,7 +69,7 @@ public void asyncClientBuilderClass() throws Exception {
     }
 
     private void validateGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {
-        assertThat(generatorConstructor.apply(ClientTestModels.restJsonServiceModels()), generatesTo(expectedClassName));
+        assertThat(generatorConstructor.apply(ClientTestModels.jsonServiceModels()), generatesTo(expectedClassName));
     }
 
     private void validateQueryGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java

@@ -28,26 +28,27 @@ public class PoetClientFunctionalTests {
 
     @Test
     public void asyncClientClass() throws Exception {
-        AsyncClientClass asyncClientClass = createAsyncClientClass(ClientTestModels.restJsonServiceModels());
+        AsyncClientClass asyncClientClass = new AsyncClientClass(
+                GeneratorTaskParams.create(ClientTestModels.jsonServiceModels(), "sources/", "tests/"));
         assertThat(asyncClientClass, generatesTo("test-async-client-class.java"));
     }
 
     @Test
     public void asyncClientInterface() throws Exception {
-        ClassSpec asyncClientInterface = new AsyncClientInterface(ClientTestModels.restJsonServiceModels());
+        ClassSpec asyncClientInterface = new AsyncClientInterface(ClientTestModels.jsonServiceModels());
         assertThat(asyncClientInterface, generatesTo("test-json-async-client-interface.java"));
     }
 
     @Test
     public void simpleMethodsIntegClass() throws Exception {
         ClientSimpleMethodsIntegrationTests simpleMethodsClass = new ClientSimpleMethodsIntegrationTests(
-                ClientTestModels.restJsonServiceModels());
+                ClientTestModels.jsonServiceModels());
         assertThat(simpleMethodsClass, generatesTo("test-simple-methods-integ-class.java"));
     }
 
     @Test
-    public void syncClientClassRestJson() throws Exception {
-        SyncClientClass syncClientClass = createSyncClientClass(ClientTestModels.restJsonServiceModels());
+    public void syncClientClassJson() throws Exception {
+        SyncClientClass syncClientClass = createSyncClientClass(ClientTestModels.jsonServiceModels());
         assertThat(syncClientClass, generatesTo("test-json-client-class.java"));
     }
 
@@ -57,11 +58,6 @@ public void syncClientClassQuery() throws Exception {
         assertThat(syncClientClass, generatesTo("test-query-client-class.java"));
     }
 
-    @Test
-    public void asyncClientClassAwsJson() throws Exception {
-        AsyncClientClass asyncClientClass = createAsyncClientClass(ClientTestModels.awsJsonServiceModels());
-        assertThat(asyncClientClass, generatesTo("test-aws-json-async-client-class.java"));
-    }
 
     @Test
     public void asyncClientClassQuery() throws Exception {
@@ -75,6 +71,7 @@ public void syncClientClassXml() throws Exception {
         assertThat(syncClientClass, generatesTo("test-xml-client-class.java"));
     }
 
+
     @Test
     public void asyncClientClassXml() throws Exception {
         AsyncClientClass syncClientClass = createAsyncClientClass(ClientTestModels.xmlServiceModels());
@@ -91,7 +88,7 @@ private AsyncClientClass createAsyncClientClass(IntermediateModel model) {
 
     @Test
     public void syncClientInterface() throws Exception {
-        ClassSpec syncClientInterface = new SyncClientInterface(ClientTestModels.restJsonServiceModels());
+        ClassSpec syncClientInterface = new SyncClientInterface(ClientTestModels.jsonServiceModels());
         assertThat(syncClientInterface, generatesTo("test-json-client-interface.java"));
     }
 

codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java

@@ -45,7 +45,7 @@ public void responseHandlerBuilder() throws Exception {
 
     private void runTest(BiFunction<GeneratorTaskParams, OperationModel, ClassSpec> specFactory,
                          String expectedTestFile) {
-        IntermediateModel model = ClientTestModels.restJsonServiceModels();
+        IntermediateModel model = ClientTestModels.jsonServiceModels();
         GeneratorTaskParams dependencies = GeneratorTaskParams.create(model, "sources/", "tests/");
         ClassSpec classSpec = specFactory.apply(dependencies, model.getOperation("EventStreamOperation"));
         assertThat(classSpec, generatesTo(expectedTestFile));