Prefer ID for hasTrait lookups

This commit updates all calls to `hasTrait` from using Class based
lookups to use ID based lookups. Traits are stored on a Shape in a
ShapeId-keyed map. Using this will be faster than testing values
via `isInstance`.

The lookup for `hasTrait(ShapeId)` is also updated to do a simple
`containsKey` check on the map. This eliminates using `findTrait`
which creates an intermediate `Optional` only to throw it away.

Author: kstich

buildSrc/src/main/kotlin/smithy.profiling-conventions.gradle.kts

@@ -11,3 +11,8 @@ tasks {
         duplicatesStrategy = DuplicatesStrategy.WARN
     }
 }
+
+// We don't need to lint benchmarks.
+tasks.findByName("spotbugsJmh")?.apply {
+    enabled = false
+}

smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddRequestValidators.java

@@ -77,8 +77,8 @@ public OpenApi after(Context<? extends Trait> context, OpenApi openapi) {
 
         // Check if the service has a request validator.
         String serviceValidator = null;
-        if (context.getService().getTrait(RequestValidatorTrait.class).isPresent()) {
-            serviceValidator = context.getService().getTrait(RequestValidatorTrait.class).get().getValue();
+        if (context.getService().hasTrait(RequestValidatorTrait.ID)) {
+            serviceValidator = context.getService().expectTrait(RequestValidatorTrait.class).getValue();
             validators.add(serviceValidator);
         }
 

smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceIndex.java

@@ -237,7 +237,7 @@ private Set<Mutability> getDefaultIdentifierMutabilities(ResourceShape resource)
     private List<Map<String, ShapeId>> computeResourceAdditionalIdentifiers(StructureShape readInput) {
         List<Map<String, ShapeId>> identifiers = new ArrayList<>();
         for (MemberShape member : readInput.members()) {
-            if (!member.hasTrait(CfnAdditionalIdentifierTrait.class)) {
+            if (!member.hasTrait(CfnAdditionalIdentifierTrait.ID)) {
                 continue;
             }
 

smithy-aws-cloudformation-traits/src/test/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTraitTest.java

@@ -26,20 +26,20 @@ public void loadsFromModel() {
                 .unwrap();
 
         Shape fooResource = result.expectShape(ShapeId.from("smithy.example#FooResource"));
-        assertTrue(fooResource.hasTrait(CfnResourceTrait.class));
+        assertTrue(fooResource.hasTrait(CfnResourceTrait.ID));
         CfnResourceTrait fooTrait = fooResource.expectTrait(CfnResourceTrait.class);
         assertFalse(fooTrait.getName().isPresent());
         assertTrue(fooTrait.getAdditionalSchemas().isEmpty());
 
         Shape barResource = result.expectShape(ShapeId.from("smithy.example#BarResource"));
-        assertTrue(barResource.hasTrait(CfnResourceTrait.class));
+        assertTrue(barResource.hasTrait(CfnResourceTrait.ID));
         CfnResourceTrait barTrait = barResource.expectTrait(CfnResourceTrait.class);
         assertThat(barTrait.getName().get(), equalTo("CustomResource"));
         assertFalse(barTrait.getAdditionalSchemas().isEmpty());
         assertThat(barTrait.getAdditionalSchemas(), contains(ShapeId.from("smithy.example#ExtraBarRequest")));
 
         Shape tadResource = result.expectShape(ShapeId.from("smithy.example#TadResource"));
-        assertTrue(tadResource.hasTrait(CfnResourceTrait.class));
+        assertTrue(tadResource.hasTrait(CfnResourceTrait.ID));
         CfnResourceTrait tadTrait = tadResource.expectTrait(CfnResourceTrait.class);
         assertFalse(tadTrait.getName().isPresent());
         assertTrue(tadTrait.getAdditionalSchemas().isEmpty());

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/CfnConverter.java

@@ -166,7 +166,7 @@ private List<ConversionEnvironment> createConversionEnvironments(Model model) {
         // Create an environment for each of the resources to be converted with.
         List<ConversionEnvironment> environments = new ArrayList<>();
         for (ResourceShape resourceShape : resourceShapes) {
-            if (resourceShape.getTrait(CfnResourceTrait.class).isPresent()) {
+            if (resourceShape.hasTrait(CfnResourceTrait.ID)) {
                 ConversionEnvironment environment = createConversionEnvironment(model, serviceShape, resourceShape);
                 environments.add(environment);
             }

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/mappers/HandlerPermissionMapper.java

@@ -56,7 +56,7 @@ public void before(Context context, ResourceSchema.Builder resourceSchema) {
                 .orElse(SetUtils.of());
         createPermissions.addAll(putPermissions);
         // Put operations without the noReplace trait are used for updates.
-        if (!resource.hasTrait(NoReplaceTrait.class)) {
+        if (!resource.hasTrait(NoReplaceTrait.ID)) {
             updatePermissions.addAll(putPermissions);
         }
 

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/fromsmithy/mappers/TaggingMapper.java

@@ -43,7 +43,7 @@ public static void injectTagsMember(
             StructureShape.Builder builder
     ) {
         String tagMemberName = getTagMemberName(config, resource);
-        if (resource.hasTrait(TaggableTrait.class)) {
+        if (resource.hasTrait(TaggableTrait.ID)) {
             AwsTagIndex tagIndex = AwsTagIndex.of(model);
             TaggableTrait trait = resource.expectTrait(TaggableTrait.class);
             CfnResourceIndex resourceIndex = CfnResourceIndex.of(model);
@@ -68,7 +68,7 @@ public static void injectTagsMember(
     @Override
     public ResourceSchema after(Context context, ResourceSchema resourceSchema) {
         ResourceShape resourceShape = context.getResource();
-        if (!resourceShape.hasTrait(TaggableTrait.class)) {
+        if (!resourceShape.hasTrait(TaggableTrait.ID)) {
             return resourceSchema;
         }
 

smithy-aws-iam-traits/src/main/java/software/amazon/smithy/aws/iam/traits/ConditionKeysIndex.java

@@ -174,8 +174,8 @@ private void compute(
 
         // Continue recursing into resources and computing keys.
         subject.asResourceShape().ifPresent(resource -> {
-            boolean disableConditionKeyInference = resource.hasTrait(DisableConditionKeyInferenceTrait.class)
-                    || service.hasTrait(DisableConditionKeyInferenceTrait.class);
+            boolean disableConditionKeyInference = resource.hasTrait(DisableConditionKeyInferenceTrait.ID)
+                    || service.hasTrait(DisableConditionKeyInferenceTrait.ID);
 
             // Add any inferred resource identifiers to the resource and to the service-wide definitions.
             Map<String, String> childIdentifiers = !disableConditionKeyInference
@@ -218,7 +218,7 @@ private Map<String, String> inferChildResourceIdentifiers(
                 // Only infer identifiers introduced by a child. Children should
                 // use their parent identifiers and not duplicate them.
                 ConditionKeyDefinition.Builder builder = ConditionKeyDefinition.builder();
-                if (shape.hasTrait(ArnReferenceTrait.class)) {
+                if (shape.hasTrait(ArnReferenceTrait.ID)) {
                     // Use an ARN type if the targeted shape has the arnReference trait.
                     builder.type(ARN_TYPE);
                 } else {

smithy-aws-iam-traits/src/main/java/software/amazon/smithy/aws/iam/traits/ConditionKeysValidator.java

@@ -40,13 +40,13 @@ public List<ValidationEvent> validate(Model model) {
         OperationIndex operationIndex = OperationIndex.of(model);
 
         return model.shapes(ServiceShape.class)
-                .filter(service -> service.hasTrait(ServiceTrait.class))
+                .filter(service -> service.hasTrait(ServiceTrait.ID))
                 .flatMap(service -> {
                     List<ValidationEvent> results = new ArrayList<>();
                     Set<String> knownKeys = conditionIndex.getDefinedConditionKeys(service).keySet();
                     Set<String> serviceResolvedKeys = Collections.emptySet();
 
-                    if (service.hasTrait(ServiceResolvedConditionKeysTrait.class)) {
+                    if (service.hasTrait(ServiceResolvedConditionKeysTrait.ID)) {
                         ServiceResolvedConditionKeysTrait trait =
                                 service.expectTrait(ServiceResolvedConditionKeysTrait.class);
                         //assign so we can compare against condition key values for any intersection
@@ -83,7 +83,7 @@ public List<ValidationEvent> validate(Model model) {
                         }
 
                         for (MemberShape memberShape : operationIndex.getInputMembers(operation).values()) {
-                            if (memberShape.hasTrait(ConditionKeyValueTrait.class)) {
+                            if (memberShape.hasTrait(ConditionKeyValueTrait.ID)) {
                                 ConditionKeyValueTrait trait = memberShape.expectTrait(ConditionKeyValueTrait.class);
                                 String conditionKey = trait.getValue();
                                 if (!knownKeys.contains(conditionKey)) {

smithy-aws-iam-traits/src/main/java/software/amazon/smithy/aws/iam/traits/IamResourceTraitValidator.java

@@ -28,7 +28,7 @@ public List<ValidationEvent> validate(Model model) {
         for (ResourceShape resource : model.getResourceShapesWithTrait(IamResourceTrait.class)) {
             // If the resource has both the IamResourceTrait and Arn trait,
             // check that the resource name is consistent between the two traits
-            if (resource.hasTrait(ArnTrait.class)) {
+            if (resource.hasTrait(ArnTrait.ID)) {
                 String resourceName = resource.expectTrait(IamResourceTrait.class)
                         .getName()
                         .orElseGet(() -> StringUtils.lowerCase(resource.getId().getName()));