Revert "Enforce private on traits (smithy-lang#1406)"

This reverts commit 88e2d1f.
milesziemer · Sep 28, 2022 · a0a76c3 · a0a76c3
1 parent 5281e72
commit a0a76c3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/smithy-aws-traits/src/main/resources/META-INF/smithy/aws.protocols.smithy b/smithy-aws-traits/src/main/resources/META-INF/smithy/aws.protocols.smithy
@@ -32,7 +32,7 @@ structure awsJson1_1 with [HttpConfiguration] {}
 
 /// Contains HTTP protocol configuration for HTTP-based protocols.
 @private
-@mixin(localTraits: [private])
+@mixin
 structure HttpConfiguration {
     /// The priority ordered list of supported HTTP protocol versions.
     http: StringList

diff --git a/.../main/java/software/amazon/smithy/model/validation/validators/PrivateAccessValidator.java b/.../main/java/software/amazon/smithy/model/validation/validators/PrivateAccessValidator.java
@@ -35,7 +35,7 @@ public final class PrivateAccessValidator extends AbstractValidator {
 
     @Override
     public List<ValidationEvent> validate(Model model) {
-        NeighborProvider provider = NeighborProviderIndex.of(model).getReverseProviderWithTraitRelationships();
+        NeighborProvider provider = NeighborProviderIndex.of(model).getReverseProvider();
 
         List<ValidationEvent> events = new ArrayList<>();
         for (Shape privateShape : model.getShapesWithTrait(PrivateTrait.class)) {

diff --git a/...c/test/resources/software/amazon/smithy/model/errorfiles/validators/private-access.errors b/...c/test/resources/software/amazon/smithy/model/errorfiles/validators/private-access.errors
@@ -6,4 +6,3 @@
 [ERROR] smithy.example#InvalidOperation: This shape has an invalid output relationship that targets a private shape, `smithy.private#InvalidOperationOutput`, in another namespace. | PrivateAccess
 [ERROR] smithy.example#InvalidService: This shape has an invalid operation relationship that targets a private shape, `smithy.private#PrivateOperation`, in another namespace. | PrivateAccess
 [ERROR] smithy.example#InvalidStructure$invalid: This shape has an invalid member_target relationship that targets a private shape, `smithy.private#PrivateString`, in another namespace. | PrivateAccess
-[ERROR] smithy.example#InvalidTraitApplication: This shape has an invalid trait relationship that targets a private shape, `smithy.private#privateTrait`, in another namespace. | PrivateAccess
diff --git a/...src/test/resources/software/amazon/smithy/model/errorfiles/validators/private-access.json b/...src/test/resources/software/amazon/smithy/model/errorfiles/validators/private-access.json
@@ -50,20 +50,6 @@
                 }
             ]
         },
-        "smithy.example#InvalidTraitApplication": {
-            "type": "structure",
-            "members": {},
-            "traits": {
-                "smithy.private#privateTrait": {}
-            }
-        },
-        "smithy.private#privateTrait": {
-            "type": "structure",
-            "traits": {
-                "smithy.api#trait": {},
-                "smithy.api#private": {}
-            }
-        },
         "smithy.private#InvalidOperationInput": {
             "type": "structure",
             "members": {
@@ -78,9 +64,6 @@
                 },
                 "map": {
                     "target": "smithy.example#InvalidMap"
-                },
-                "traitApplication": {
-                    "target": "smithy.example#InvalidTraitApplication"
                 }
             },
             "traits": {
@@ -102,9 +85,6 @@
                 },
                 "map": {
                     "target": "smithy.example#InvalidMap"
-                },
-                "traitApplication": {
-                    "target": "smithy.example#InvalidTraitApplication"
                 }
             },
             "traits": {