Rename bdd trait to endpointBdd

Author: mtdowling

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/validators/RuleSetAwsBuiltInValidator.java

@@ -14,7 +14,7 @@
 import software.amazon.smithy.model.validation.ValidationEvent;
 import software.amazon.smithy.rulesengine.aws.language.functions.AwsBuiltIns;
 import software.amazon.smithy.rulesengine.language.syntax.parameters.Parameter;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.utils.SetUtils;
 
@@ -38,8 +38,8 @@ public List<ValidationEvent> validate(Model model) {
             validateRuleSetAwsBuiltIns(events, s, trait.getEndpointRuleSet().getParameters());
         }
 
-        for (ServiceShape s : model.getServiceShapesWithTrait(BddTrait.class)) {
-            validateRuleSetAwsBuiltIns(events, s, s.expectTrait(BddTrait.class).getParameters());
+        for (ServiceShape s : model.getServiceShapesWithTrait(EndpointBddTrait.class)) {
+            validateRuleSetAwsBuiltIns(events, s, s.expectTrait(EndpointBddTrait.class).getParameters());
         }
 
         return events;

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/evaluation/RuleEvaluator.java

@@ -27,7 +27,7 @@
 import software.amazon.smithy.rulesengine.language.syntax.rule.RuleValueVisitor;
 import software.amazon.smithy.rulesengine.logic.RuleBasedConditionEvaluator;
 import software.amazon.smithy.rulesengine.logic.bdd.Bdd;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**
@@ -57,7 +57,7 @@ public static Value evaluate(EndpointRuleSet ruleset, Map<Identifier, Value> par
      * @param args The rule-set parameter identifiers and values to evaluate the BDD against.
      * @return The resulting value from the final matched rule.
      */
-    public static Value evaluate(BddTrait trait, Map<Identifier, Value> args) {
+    public static Value evaluate(EndpointBddTrait trait, Map<Identifier, Value> args) {
         return evaluate(trait.getBdd(), trait.getParameters(), trait.getConditions(), trait.getResults(), args);
     }
 

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/evaluation/TestEvaluator.java

@@ -13,7 +13,7 @@
 import software.amazon.smithy.rulesengine.language.evaluation.value.EndpointValue;
 import software.amazon.smithy.rulesengine.language.evaluation.value.Value;
 import software.amazon.smithy.rulesengine.language.syntax.Identifier;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointTestCase;
 import software.amazon.smithy.rulesengine.traits.EndpointTestExpectation;
 import software.amazon.smithy.rulesengine.traits.ExpectedEndpoint;
@@ -45,7 +45,7 @@ public static void evaluate(EndpointRuleSet ruleset, EndpointTestCase testCase)
      * @param bdd      The BDD trait to be tested.
      * @param testCase The test case.
      */
-    public static void evaluate(BddTrait bdd, EndpointTestCase testCase) {
+    public static void evaluate(EndpointBddTrait bdd, EndpointTestCase testCase) {
         Value result = RuleEvaluator.evaluate(bdd, createParams(testCase));
         processResult(result, testCase);
     }

…ithy/rulesengine/logic/bdd/BddTrait.java …esengine/logic/bdd/EndpointBddTrait.javasmithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/BddTrait.java renamed to smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/EndpointBddTrait.java smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/BddTrait.java renamed to smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/EndpointBddTrait.java

@@ -34,8 +34,8 @@
 /**
  * Trait containing a precompiled BDD with full context for endpoint resolution.
  */
-public final class BddTrait extends AbstractTrait implements ToSmithyBuilder<BddTrait> {
-    public static final ShapeId ID = ShapeId.from("smithy.rules#bdd");
+public final class EndpointBddTrait extends AbstractTrait implements ToSmithyBuilder<EndpointBddTrait> {
+    public static final ShapeId ID = ShapeId.from("smithy.rules#endpointBdd");
 
     private static final Set<String> ALLOWED_PROPERTIES = SetUtils.of(
             "parameters",
@@ -50,7 +50,7 @@ public final class BddTrait extends AbstractTrait implements ToSmithyBuilder<Bdd
     private final List<Rule> results;
     private final Bdd bdd;
 
-    private BddTrait(Builder builder) {
+    private EndpointBddTrait(Builder builder) {
         super(ID, builder.getSourceLocation());
         this.parameters = SmithyBuilder.requiredState("parameters", builder.parameters);
         this.conditions = SmithyBuilder.requiredState("conditions", builder.conditions);
@@ -64,7 +64,7 @@ private BddTrait(Builder builder) {
      * @param cfg the control flow graph to compile
      * @return the BddTrait containing the compiled BDD and all context
      */
-    public static BddTrait from(Cfg cfg) {
+    public static EndpointBddTrait from(Cfg cfg) {
         BddCompiler compiler = new BddCompiler(cfg, new BddBuilder());
         Bdd bdd = compiler.compile();
 
@@ -122,7 +122,7 @@ public Bdd getBdd() {
      * @param transformer Transformer used to modify the trait.
      * @return the updated trait.
      */
-    public BddTrait transform(Function<BddTrait, BddTrait> transformer) {
+    public EndpointBddTrait transform(Function<EndpointBddTrait, EndpointBddTrait> transformer) {
         return transformer.apply(this);
     }
 
@@ -164,7 +164,7 @@ protected Node createNode() {
      * @param node the node to parse
      * @return the BddTrait
      */
-    public static BddTrait fromNode(Node node) {
+    public static EndpointBddTrait fromNode(Node node) {
         ObjectNode obj = node.expectObjectNode();
         obj.warnIfAdditionalProperties(ALLOWED_PROPERTIES);
         Parameters params = Parameters.fromNode(obj.expectObjectMember("parameters"));
@@ -181,7 +181,7 @@ public static BddTrait fromNode(Node node) {
 
         Bdd bdd = decodeBdd(nodesBase64, nodeCount, rootRef, conditions.size(), results.size());
 
-        BddTrait trait = builder()
+        EndpointBddTrait trait = builder()
                 .sourceLocation(node)
                 .parameters(params)
                 .conditions(conditions)
@@ -251,7 +251,7 @@ public Builder toBuilder() {
     /**
      * Builder for BddTrait.
      */
-    public static final class Builder extends AbstractTraitBuilder<BddTrait, Builder> {
+    public static final class Builder extends AbstractTraitBuilder<EndpointBddTrait, Builder> {
         private Parameters parameters;
         private List<Condition> conditions;
         private List<Rule> results;
@@ -304,8 +304,8 @@ public Builder bdd(Bdd bdd) {
         }
 
         @Override
-        public BddTrait build() {
-            return new BddTrait(this);
+        public EndpointBddTrait build() {
+            return new EndpointBddTrait(this);
         }
     }
 
@@ -316,7 +316,7 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            BddTrait trait = BddTrait.fromNode(value);
+            EndpointBddTrait trait = EndpointBddTrait.fromNode(value);
             trait.setNodeCache(value);
             return trait;
         }

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/NodeReversal.java

@@ -13,12 +13,12 @@
  * <p>This transformation reverses the node array (except the terminal at index 0)
  * and updates all references throughout the BDD to maintain correctness.
  */
-public final class NodeReversal implements Function<BddTrait, BddTrait> {
+public final class NodeReversal implements Function<EndpointBddTrait, EndpointBddTrait> {
 
     private static final Logger LOGGER = Logger.getLogger(NodeReversal.class.getName());
 
     @Override
-    public BddTrait apply(BddTrait trait) {
+    public EndpointBddTrait apply(EndpointBddTrait trait) {
         Bdd reversedBdd = reverse(trait.getBdd());
         // Only rebuild the trait if the BDD actually changed
         return reversedBdd == trait.getBdd() ? trait : trait.toBuilder().bdd(reversedBdd).build();

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/logic/bdd/SiftingOptimization.java

@@ -30,7 +30,7 @@
  *   <li>Granular: Fine-tuned optimization for maximum reduction</li>
  * </ul>
  */
-public final class SiftingOptimization implements Function<BddTrait, BddTrait> {
+public final class SiftingOptimization implements Function<EndpointBddTrait, EndpointBddTrait> {
     private static final Logger LOGGER = Logger.getLogger(SiftingOptimization.class.getName());
 
     // When to use a parallel stream
@@ -96,15 +96,15 @@ public static Builder builder() {
     }
 
     @Override
-    public BddTrait apply(BddTrait trait) {
+    public EndpointBddTrait apply(EndpointBddTrait trait) {
         try {
             return doApply(trait);
         } finally {
             threadBuilder.remove();
         }
     }
 
-    private BddTrait doApply(BddTrait trait) {
+    private EndpointBddTrait doApply(EndpointBddTrait trait) {
         LOGGER.info("Starting BDD sifting optimization");
         long startTime = System.currentTimeMillis();
         OptimizationState state = initializeOptimization(trait);
@@ -135,7 +135,7 @@ private BddTrait doApply(BddTrait trait) {
         return trait.toBuilder().conditions(state.orderView).results(state.results).bdd(state.bestBdd).build();
     }
 
-    private OptimizationState initializeOptimization(BddTrait trait) {
+    private OptimizationState initializeOptimization(EndpointBddTrait trait) {
         // Use the trait's existing ordering as the starting point
         List<Condition> initialOrder = new ArrayList<>(trait.getConditions());
         Condition[] order = initialOrder.toArray(new Condition[0]);

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/BddTraitValidator.java

@@ -12,24 +12,24 @@
 import software.amazon.smithy.model.validation.AbstractValidator;
 import software.amazon.smithy.model.validation.ValidationEvent;
 import software.amazon.smithy.rulesengine.logic.bdd.Bdd;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 
 public final class BddTraitValidator extends AbstractValidator {
     @Override
     public List<ValidationEvent> validate(Model model) {
-        if (!model.isTraitApplied(BddTrait.class)) {
+        if (!model.isTraitApplied(EndpointBddTrait.class)) {
             return Collections.emptyList();
         }
 
         List<ValidationEvent> events = new ArrayList<>();
-        for (ServiceShape service : model.getServiceShapesWithTrait(BddTrait.class)) {
-            validateService(events, service, service.expectTrait(BddTrait.class));
+        for (ServiceShape service : model.getServiceShapesWithTrait(EndpointBddTrait.class)) {
+            validateService(events, service, service.expectTrait(EndpointBddTrait.class));
         }
 
         return events;
     }
 
-    private void validateService(List<ValidationEvent> events, ServiceShape service, BddTrait trait) {
+    private void validateService(List<ValidationEvent> events, ServiceShape service, EndpointBddTrait trait) {
         Bdd bdd = trait.getBdd();
 
         // Validate root reference
@@ -87,11 +87,11 @@ private void validateService(List<ValidationEvent> events, ServiceShape service,
     private void validateReference(
             List<ValidationEvent> events,
             ServiceShape service,
-            BddTrait trait,
+            EndpointBddTrait trait,
             String context,
             int ref,
             Bdd bdd,
-            BddTrait bddTrait
+            EndpointBddTrait bddTrait
     ) {
         if (ref == 0) {
             events.add(error(service, trait, String.format("%s has invalid reference: 0", context)));

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/EndpointTestsTraitValidator.java

@@ -20,7 +20,7 @@
 import software.amazon.smithy.model.validation.ValidationEvent;
 import software.amazon.smithy.rulesengine.language.syntax.parameters.Parameter;
 import software.amazon.smithy.rulesengine.language.syntax.parameters.Parameters;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointTestCase;
 import software.amazon.smithy.rulesengine.traits.EndpointTestOperationInput;
@@ -52,7 +52,7 @@ public List<ValidationEvent> validate(Model model) {
                         operationNameMap);
             });
 
-            serviceShape.getTrait(BddTrait.class).ifPresent(trait -> {
+            serviceShape.getTrait(EndpointBddTrait.class).ifPresent(trait -> {
                 validateEndpointRuleSet(events, model, serviceShape, trait.getParameters(), operationNameMap);
             });
         }

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/RuleSetAuthSchemesValidator.java

@@ -21,7 +21,7 @@
 import software.amazon.smithy.rulesengine.language.syntax.rule.EndpointRule;
 import software.amazon.smithy.rulesengine.language.syntax.rule.Rule;
 import software.amazon.smithy.rulesengine.language.syntax.rule.TreeRule;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 
 /**
@@ -35,7 +35,7 @@ public List<ValidationEvent> validate(Model model) {
         List<ValidationEvent> events = new ArrayList<>();
         for (ServiceShape serviceShape : model.getServiceShapes()) {
             visitRuleset(events, serviceShape, serviceShape.getTrait(EndpointRuleSetTrait.class).orElse(null));
-            visitBdd(events, serviceShape, serviceShape.getTrait(BddTrait.class).orElse(null));
+            visitBdd(events, serviceShape, serviceShape.getTrait(EndpointBddTrait.class).orElse(null));
         }
         return events;
     }
@@ -48,7 +48,7 @@ private void visitRuleset(List<ValidationEvent> events, ServiceShape serviceShap
         }
     }
 
-    private void visitBdd(List<ValidationEvent> events, ServiceShape serviceShape, BddTrait trait) {
+    private void visitBdd(List<ValidationEvent> events, ServiceShape serviceShape, EndpointBddTrait trait) {
         if (trait != null) {
             for (Rule result : trait.getResults()) {
                 if (result instanceof EndpointRule) {

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/RuleSetBuiltInValidator.java

@@ -15,7 +15,7 @@
 import software.amazon.smithy.model.validation.ValidationEvent;
 import software.amazon.smithy.rulesengine.language.EndpointRuleSet;
 import software.amazon.smithy.rulesengine.language.syntax.parameters.Parameter;
-import software.amazon.smithy.rulesengine.logic.bdd.BddTrait;
+import software.amazon.smithy.rulesengine.logic.bdd.EndpointBddTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.rulesengine.traits.EndpointTestCase;
 import software.amazon.smithy.rulesengine.traits.EndpointTestOperationInput;
@@ -29,8 +29,8 @@ public final class RuleSetBuiltInValidator extends AbstractValidator {
     public List<ValidationEvent> validate(Model model) {
         List<ValidationEvent> events = new ArrayList<>();
 
-        for (ServiceShape s : model.getServiceShapesWithTrait(BddTrait.class)) {
-            validateParams(events, s, s.expectTrait(BddTrait.class).getParameters());
+        for (ServiceShape s : model.getServiceShapesWithTrait(EndpointBddTrait.class)) {
+            validateParams(events, s, s.expectTrait(EndpointBddTrait.class).getParameters());
         }
 
         for (ServiceShape s : model.getServiceShapesWithTrait(EndpointRuleSetTrait.class)) {