Include shape name in REQUEST_URI_NOT_FOUND validation error message

Author: RanVaknin

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

@@ -367,7 +367,13 @@ private String findRequestUri(Shape parentShape, Map<String, Shape> allC2jShapes
 
         return operation.map(o -> o.getHttp().getRequestUri())
                         .orElseThrow(() -> {
-                            String detailMsg = "Could not find request URI for input shape for operation: " + operation;
+                            String shapeName = allC2jShapes.entrySet().stream()
+                                .filter(e -> e.getValue().equals(parentShape))
+                                .map(Map.Entry::getKey)
+                                .findFirst()
+                                .orElse("unknown");
+                            String detailMsg = "Could not find request URI for input shape '" + shapeName
+                                + "'. No operation was found that references this shape as its input.";
                             ValidationEntry entry =
                                 new ValidationEntry().withErrorId(ValidationErrorId.REQUEST_URI_NOT_FOUND)
                                                      .withDetailMessage(detailMsg)

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

@@ -48,6 +48,7 @@
 import software.amazon.awssdk.codegen.poet.ClientTestModels;
 import software.amazon.awssdk.codegen.validation.ModelInvalidException;
 import software.amazon.awssdk.codegen.validation.ModelValidator;
+import software.amazon.awssdk.codegen.validation.ValidationEntry;
 import software.amazon.awssdk.codegen.validation.ValidationErrorId;
 
 public class CodeGeneratorTest {
@@ -176,6 +177,23 @@ void execute_endpointsTestReferencesUnknownOperationMember_throwsValidationError
             });
     }
 
+    @Test
+    void execute_uriLocationOnNonInputShape_throwsValidationErrorWithShapeName() throws IOException {
+        C2jModels models = C2jModels.builder()
+                                    .customizationConfig(CustomizationConfig.create())
+                                    .serviceModel(getUriOnNonInputShapeServiceModel())
+                                    .build();
+
+        assertThatThrownBy(() -> generateCodeFromC2jModels(models, outputDir, true, Collections.emptyList()))
+            .isInstanceOf(ModelInvalidException.class)
+            .matches(e -> {
+                ModelInvalidException ex = (ModelInvalidException) e;
+                ValidationEntry entry = ex.validationEntries().get(0);
+                return entry.getErrorId() == ValidationErrorId.REQUEST_URI_NOT_FOUND
+                       && entry.getDetailMessage().contains("No operation was found");
+            });
+    }
+
     @Test
     void execute_operationHasNoRequestUri_throwsValidationError() throws IOException {
         C2jModels models = C2jModels.builder()
@@ -244,6 +262,11 @@ private ServiceModel getMissingRequestUriServiceModel() throws IOException {
         return Jackson.load(ServiceModel.class, json);
     }
 
+    private ServiceModel getUriOnNonInputShapeServiceModel() throws IOException {
+        String json = resourceAsString("uri-on-non-input-shape-service.json");
+        return Jackson.load(ServiceModel.class, json);
+    }
+
     private String resourceAsString(String name) throws IOException {
         ByteArrayOutputStream baos;
         try (InputStream resourceAsStream = getClass().getResourceAsStream(name)) {

codegen/src/test/resources/software/amazon/awssdk/codegen/uri-on-non-input-shape-service.json

@@ -0,0 +1,57 @@
+{
+  "version": "2.0",
+  "metadata": {
+    "apiVersion": "2010-05-08",
+    "endpointPrefix": "json-service-endpoint",
+    "globalEndpoint": "json-service.amazonaws.com",
+    "protocol": "rest-json",
+    "serviceAbbreviation": "Rest Json Service",
+    "serviceFullName": "Some Service That Uses Rest-Json Protocol",
+    "serviceId": "Rest Json Service",
+    "signingName": "json-service",
+    "signatureVersion": "v4",
+    "uid": "json-service-2010-05-08",
+    "xmlNamespace": "https://json-service.amazonaws.com/doc/2010-05-08/"
+  },
+  "operations": {
+    "SomeOperation": {
+      "name": "SomeOperation",
+      "http": {
+        "method": "POST",
+        "requestUri": "/things/{thingId}"
+      },
+      "input": {
+        "shape": "SomeOperationRequest"
+      }
+    }
+  },
+  "shapes": {
+    "SomeOperationRequest": {
+      "type": "structure",
+      "members": {
+        "thingId": {
+          "shape": "String",
+          "location": "uri",
+          "locationName": "thingId"
+        },
+        "options": {
+          "shape": "NestedOptions"
+        }
+      }
+    },
+    "NestedOptions": {
+      "type": "structure",
+      "members": {
+        "pageSize": {
+          "shape": "String",
+          "location": "uri",
+          "locationName": "pageSize"
+        }
+      }
+    },
+    "String": {
+      "type": "string"
+    }
+  },
+  "documentation": "A service with a uri-bound member on a non-input shape"
+}