Add and use expect* methods more + some cleanup

This commit uses the expectTrait methods and hasTrait methods more
instead of using .get(). This will give much more clear error messages
in the event of a logical error in code.

This also adds expect* methods that expect a shape to be of a specific
type. This cleans up a lot of call sites that were using an unsafe
.get() after calling .asBlob, asString, etc.

Author: mtdowling

smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/apigateway/AuthorizersTraitValidator.java

@@ -58,7 +58,7 @@ private Optional<ValidationEvent> validateService(Model model, ServiceShape serv
             return Optional.empty();
         }
 
-        AuthorizersTrait authorizersTrait = service.getTrait(AuthorizersTrait.class).get();
+        AuthorizersTrait authorizersTrait = service.expectTrait(AuthorizersTrait.class);
         return Optional.of(error(service, authorizersTrait, String.format(
                 "Each `scheme` of the `%s` trait must target one of the auth schemes applied to the service "
                 + "(i.e., [%s]). The following mappings of authorizer names to schemes are invalid: %s",

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/ArnIndexTest.java

@@ -43,15 +43,15 @@ public static void beforeClass() {
     public void loadsFromModel() {
         ArnIndex arnIndex = new ArnIndex(model);
         ShapeId id = ShapeId.from("ns.foo#SomeService");
-        Shape someResource = model.getShape(ShapeId.from("ns.foo#SomeResource")).get();
+        Shape someResource = model.expectShape(ShapeId.from("ns.foo#SomeResource"));
         ArnTrait template1 = ArnTrait.builder()
                 .template("someresource/{someId}")
                 .build();
-        Shape childResource = model.getShape(ShapeId.from("ns.foo#ChildResource")).get();
+        Shape childResource = model.expectShape(ShapeId.from("ns.foo#ChildResource"));
         ArnTrait template2 = ArnTrait.builder()
                 .template("someresource/{someId}/{childId}")
                 .build();
-        Shape rootArnResource = model.getShape(ShapeId.from("ns.foo#RootArnResource")).get();
+        Shape rootArnResource = model.expectShape(ShapeId.from("ns.foo#RootArnResource"));
         ArnTrait template3 = ArnTrait.builder()
                 .template("rootArnResource")
                 .noAccount(true)

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/ServiceTraitTest.java

@@ -88,8 +88,8 @@ public void loadsFromModel() {
                 .unwrap();
         ServiceShape service = result
                 .expectShape(ShapeId.from("ns.foo#SomeService"))
-                .asServiceShape().get();
-        ServiceTrait trait = service.getTrait(ServiceTrait.class).get();
+                .expectServiceShape();
+        ServiceTrait trait = service.expectTrait(ServiceTrait.class);
 
         assertThat(trait.getSdkId(), equalTo("Some Value"));
         assertThat(trait.getCloudFormationName(), equalTo("SomeService"));

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTraitTest.java

@@ -33,8 +33,8 @@ public void loadsFromModel() {
                 .unwrap();
         OperationShape operation = result
                 .expectShape(ShapeId.from("ns.foo#GetObject"))
-                .asOperationShape().get();
-        ClientDiscoveredEndpointTrait trait = operation.getTrait(ClientDiscoveredEndpointTrait.class).get();
+                .expectOperationShape();
+        ClientDiscoveredEndpointTrait trait = operation.expectTrait(ClientDiscoveredEndpointTrait.class);
 
         assertTrue(trait.isRequired());
     }

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientEndpointDiscoveryIdTraitTest.java

@@ -42,10 +42,10 @@ public void loadsFromModel() {
                 .unwrap();
         OperationShape operation = result
                 .expectShape(ShapeId.from("ns.foo#GetObject"))
-                .asOperationShape().get();
+                .expectOperationShape();
         MemberShape member = result
                 .getShape(operation.getInput().get()).get()
-                .asStructureShape().get()
+                .expectStructureShape()
                 .getMember("Id").get();
 
         assertTrue(member.getTrait(ClientEndpointDiscoveryIdTrait.class).isPresent());

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientEndpointDiscoveryTraitTest.java

@@ -33,8 +33,8 @@ public void loadsFromModel() {
                 .unwrap();
         ServiceShape service = result
                 .expectShape(ShapeId.from("ns.foo#FooService"))
-                .asServiceShape().get();
-        ClientEndpointDiscoveryTrait trait = service.getTrait(ClientEndpointDiscoveryTrait.class).get();
+                .expectServiceShape();
+        ClientEndpointDiscoveryTrait trait = service.expectTrait(ClientEndpointDiscoveryTrait.class);
 
         assertEquals(trait.getOperation(), ShapeId.from("ns.foo#DescribeEndpoints"));
         assertEquals(trait.getError(), ShapeId.from("ns.foo#InvalidEndpointError"));

smithy-aws-traits/src/test/java/software/amazon/smithy/aws/traits/iam/RequiredActionsTraitTest.java

@@ -33,7 +33,7 @@ public void loadsFromModel() {
                 .assemble()
                 .unwrap();
 
-        Shape myOperation = result.getShape(ShapeId.from("smithy.example#MyOperation")).get();
+        Shape myOperation = result.expectShape(ShapeId.from("smithy.example#MyOperation"));
 
         assertTrue(myOperation.hasTrait(RequiredActionsTrait.class));
         assertThat(myOperation.getTrait(RequiredActionsTrait.class).get().getValues(), containsInAnyOrder(

smithy-build/src/test/java/software/amazon/smithy/build/SmithyBuildTest.java

@@ -206,23 +206,23 @@ public void loadsImports() throws Exception {
         Model resultB = results.getProjectionResult("b").get().getModel();
         Model resultC = results.getProjectionResult("c").get().getModel();
 
-        assertTrue(resultA.getShape(ShapeId.from("com.foo#String")).get()
+        assertTrue(resultA.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(SensitiveTrait.class).isPresent());
-        assertFalse(resultA.getShape(ShapeId.from("com.foo#String")).get()
+        assertFalse(resultA.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(DocumentationTrait.class).isPresent());
 
-        assertTrue(resultB.getShape(ShapeId.from("com.foo#String")).get()
+        assertTrue(resultB.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(SensitiveTrait.class).isPresent());
-        assertTrue(resultB.getShape(ShapeId.from("com.foo#String")).get()
+        assertTrue(resultB.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(DocumentationTrait.class).isPresent());
-        assertThat(resultB.getShape(ShapeId.from("com.foo#String")).get()
+        assertThat(resultB.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(DocumentationTrait.class).get().getValue(), equalTo("b.json"));
 
-        assertTrue(resultC.getShape(ShapeId.from("com.foo#String")).get()
+        assertTrue(resultC.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(SensitiveTrait.class).isPresent());
-        assertTrue(resultC.getShape(ShapeId.from("com.foo#String")).get()
+        assertTrue(resultC.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(DocumentationTrait.class).isPresent());
-        assertThat(resultC.getShape(ShapeId.from("com.foo#String")).get()
+        assertThat(resultC.expectShape(ShapeId.from("com.foo#String"))
                            .getTrait(DocumentationTrait.class).get().getValue(), equalTo("c.json"));
     }
 

smithy-jsonschema/src/main/java/software/amazon/smithy/jsonschema/DefaultRefStrategy.java

@@ -121,8 +121,8 @@ private String createMemberPointer(MemberShape member) {
     public boolean isInlined(Shape shape) {
         // We could add more logic here in the future if needed to account for
         // member shapes that absolutely must generate a synthesized schema.
-        if (shape.asMemberShape().isPresent()) {
-            MemberShape member = shape.asMemberShape().get();
+        if (shape.isMemberShape()) {
+            MemberShape member = shape.expectMemberShape();
             Shape target = model.expectShape(member.getTarget());
             return isInlined(target);
         }

smithy-model/src/main/java/software/amazon/smithy/model/knowledge/EventStreamIndex.java

@@ -106,7 +106,7 @@ private Optional<EventStreamInfo> createEventStreamInfo(
             StructureShape structure,
             MemberShape member
     ) {
-        EventStreamTrait trait = member.getTrait(EventStreamTrait.class).get();
+        EventStreamTrait trait = member.expectTrait(EventStreamTrait.class);
 
         Shape eventStreamTarget = model.getShape(member.getTarget()).orElse(null);
         if (eventStreamTarget == null) {
@@ -118,14 +118,14 @@ private Optional<EventStreamInfo> createEventStreamInfo(
 
         // Compute the events of the event stream.
         Map<String, StructureShape> events = new HashMap<>();
-        if (eventStreamTarget.asUnionShape().isPresent()) {
-            for (MemberShape unionMember : eventStreamTarget.asUnionShape().get().getAllMembers().values()) {
+        if (eventStreamTarget.isUnionShape()) {
+            for (MemberShape unionMember : eventStreamTarget.expectUnionShape().getAllMembers().values()) {
                 model.getShape(unionMember.getTarget()).flatMap(Shape::asStructureShape).ifPresent(struct -> {
                     events.put(unionMember.getMemberName(), struct);
                 });
             }
-        } else if (eventStreamTarget.asStructureShape().isPresent()) {
-            events.put(member.getMemberName(), eventStreamTarget.asStructureShape().get());
+        } else if (eventStreamTarget.isStructureShape()) {
+            events.put(member.getMemberName(), eventStreamTarget.expectStructureShape());
         } else {
             // If the event target is an invalid type, then we can't create the indexed result.
             LOGGER.severe(() -> String.format(