Fixes after rebase

Author: adwsingh

client/client-rulesengine/src/test/java/software/amazon/smithy/java/client/rulesengine/BytecodeCompilerTest.java

@@ -201,7 +201,7 @@ void testCompileNot() {
 
     @Test
     void testCompileEndpointRule() {
-        EndpointRule rule = EndpointRule.builder()
+        Rule rule = EndpointRule.builder()
                 .endpoint(Endpoint.builder()
                         .url(Literal.stringLiteral(Template.fromString("https://example.com")))
                         .build());
@@ -221,7 +221,7 @@ void testCompileEndpointWithHeaders() {
         Map<String, List<Expression>> headers = new HashMap<>();
         headers.put("X-Custom", List.of(Literal.stringLiteral(Template.fromString("value"))));
 
-        EndpointRule rule = EndpointRule.builder()
+        Rule rule = EndpointRule.builder()
                 .endpoint(Endpoint.builder()
                         .url(Literal.stringLiteral(Template.fromString("https://example.com")))
                         .headers(headers)
@@ -243,7 +243,7 @@ void testCompileEndpointWithProperties() {
         properties.put(Identifier.of("authSchemes"),
                 Literal.tupleLiteral(List.of(Literal.stringLiteral(Template.fromString("sigv4")))));
 
-        EndpointRule rule = EndpointRule.builder()
+        Rule rule = EndpointRule.builder()
                 .endpoint(Endpoint.builder()
                         .url(Literal.stringLiteral(Template.fromString("https://example.com")))
                         .properties(properties)
@@ -260,7 +260,7 @@ void testCompileEndpointWithProperties() {
 
     @Test
     void testCompileErrorRule() {
-        ErrorRule rule = ErrorRule.builder().error(Literal.stringLiteral(Template.fromString("Invalid input")));
+        Rule rule = ErrorRule.builder().error(Literal.stringLiteral(Template.fromString("Invalid input")));
 
         List<Rule> results = List.of(NoMatchRule.INSTANCE, rule);
         EndpointBddTrait bdd = createBddWithResults(results);

client/client-rulesengine/src/test/java/software/amazon/smithy/java/client/rulesengine/DecisionTreeEndpointResolverTest.java

@@ -42,6 +42,7 @@
 import software.amazon.smithy.rulesengine.language.syntax.rule.Condition;
 import software.amazon.smithy.rulesengine.language.syntax.rule.EndpointRule;
 import software.amazon.smithy.rulesengine.language.syntax.rule.ErrorRule;
+import software.amazon.smithy.rulesengine.language.syntax.rule.Rule;
 import software.amazon.smithy.rulesengine.language.syntax.rule.TreeRule;
 
 public class DecisionTreeEndpointResolverTest {
@@ -87,7 +88,7 @@ void testParameterWithDefault() throws Exception {
                 .defaultValue(Value.stringValue("us-east-1"))
                 .build();
 
-        EndpointRule endpointRule = EndpointRule.builder()
+        Rule endpointRule = EndpointRule.builder()
                 .endpoint(Endpoint.builder().url(Expression.getReference(Identifier.of("region"))).build());
 
         EndpointRuleSet ruleSet = EndpointRuleSet.builder()
@@ -145,7 +146,7 @@ void testBuiltinParameter() throws Exception {
                 .fn(IsSet.ofExpressions(Expression.getReference(Identifier.of("endpoint"))))
                 .build();
 
-        EndpointRule endpointRule = EndpointRule.builder()
+        Rule endpointRule = EndpointRule.builder()
                 .conditions(List.of(isSetCondition))
                 .endpoint(Endpoint.builder().url(Expression.getReference(Identifier.of("endpoint"))).build());
 
@@ -174,7 +175,7 @@ void testBuiltinReturnsNull() throws Exception {
                 .defaultValue(Value.stringValue("https://default.com"))
                 .build();
 
-        EndpointRule endpointRule = EndpointRule.builder()
+        Rule endpointRule = EndpointRule.builder()
                 .endpoint(Endpoint.builder().url(Expression.getReference(Identifier.of("endpoint"))).build());
 
         EndpointRuleSet ruleSet = EndpointRuleSet.builder()
@@ -241,10 +242,10 @@ void testMultipleParameterTypes() throws Exception {
 
     @Test
     void testErrorRuleEvaluation() {
-        ErrorRule errorRule = ErrorRule.builder().error(Expression.of("Invalid configuration"));
+        Rule errorRule = ErrorRule.builder().error(Expression.of("Invalid configuration"));
 
         // Add a fallback endpoint rule that won't be reached
-        EndpointRule fallbackRule = EndpointRule.builder()
+        Rule fallbackRule = EndpointRule.builder()
                 .endpoint(Endpoint.builder().url(Expression.of("https://fallback.com")).build());
 
         // Use TreeRule to test error within a condition
@@ -278,7 +279,7 @@ void testParameterPriority() throws Exception {
                 .builtIn("AWS::Region")
                 .build();
 
-        EndpointRule endpointRule = EndpointRule.builder()
+        Rule endpointRule = EndpointRule.builder()
                 .endpoint(Endpoint.builder().url(Expression.getReference(Identifier.of("region"))).build());
 
         EndpointRuleSet ruleSet = EndpointRuleSet.builder()
@@ -307,7 +308,7 @@ void testListParameterConversion() throws Exception {
                 .type(ParameterType.STRING_ARRAY)
                 .build();
 
-        EndpointRule endpointRule = EndpointRule.builder()
+        Rule endpointRule = EndpointRule.builder()
                 .endpoint(Endpoint.builder().url(Expression.of(("https://multi-region.example.com"))).build());
 
         EndpointRuleSet ruleSet = EndpointRuleSet.builder()