changes to support more jmespath expressions

aws · Oct 30, 2024 · a940f72 · a940f72
1 parent 69c07e5
commit a940f72
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/...ain/java/com/amazonaws/util/awsclientgenerator/transform/CppEndpointsJmesPathVisitor.java b/...ain/java/com/amazonaws/util/awsclientgenerator/transform/CppEndpointsJmesPathVisitor.java
@@ -58,7 +58,9 @@ public Pair<String, Shape> visitProjection(ProjectionExpression expression) {
                         elem.left,
                         right.right);
                 }
-            ).orElseThrow(() -> new SmithyBuildException("Unsupported JMESPath expression"));
+            ).orElseThrow(() -> 
+            new SmithyBuildException("Unsupported JMESPath expression")
+            );
     }
 
     @Override
@@ -101,9 +103,10 @@ public Pair<String, Shape> visitField(FieldExpression expression) {
         String varName = expression.getName() + "Elem";
         // if a new scope started, declare variable accessed
         if (context.isStartOfNewScope() ||
-                context.getVarName().isEmpty()) {
+                context.getVarName().isEmpty() ) {
             context.addVariableInScope(varName);
         }
+
         // chain accessors
         context.getCppCode()
                 .append(MessageFormat.format(".Get{0}()", CppViewHelper.convertToUpperCamel(expression.getName())));
@@ -112,6 +115,10 @@ public Pair<String, Shape> visitField(FieldExpression expression) {
             // if leaf element, push to result
             if (member.getShape().isString()) {
                 context.addInScopeVariableToResult(Optional.empty());
+
+                //this is where we can refer to the original scope variable again
+                context.cleanupVariablesCurrentScope();
+
             }
         }
         return Pair.of(
@@ -146,7 +153,11 @@ public Pair<String, Shape> visitCurrentNode(CurrentExpression expression) {
 
     @Override
     public Pair<String, Shape> visitFlatten(FlattenExpression expression) {
-        throw new SmithyBuildException("Unsupported JMESPath expression");
+        if (expression.getExpression() instanceof ProjectionExpression) {
+            return visitProjection((ProjectionExpression) expression.getExpression());
+        }
+        // If it's not a ProjectionExpression, proceed with handling FlattenExpression
+        return expression.accept(this);
     }
 
     @Override
@@ -161,9 +172,13 @@ public Pair<String, Shape> visitLiteral(LiteralExpression expression) {
 
     @Override
     public Pair<String, Shape> visitMultiSelectList(MultiSelectListExpression expression) {
-        throw new SmithyBuildException("Unsupported JMESPath expression");
+        expression.getExpressions().forEach(expr -> {
+            expr.accept(this);
+        });
+        return Pair.of(
+            "",
+            this.input);
     }
-
     @Override
     public Pair<String, Shape> visitMultiSelectHash(MultiSelectHashExpression expression) {
         throw new SmithyBuildException("Unsupported JMESPath expression");

diff --git a/...ava/com/amazonaws/util/awsclientgenerator/transform/OperationContextCppCodeGenerator.java b/...ava/com/amazonaws/util/awsclientgenerator/transform/OperationContextCppCodeGenerator.java
@@ -1,8 +1,9 @@
 package com.amazonaws.util.awsclientgenerator.transform;
-import lombok.Data;
 import java.text.MessageFormat;
-import java.util.Stack;
 import java.util.Optional;
+import java.util.Stack;
+
+import lombok.Data;
 import software.amazon.smithy.utils.Pair;
 
 @Data
@@ -39,7 +40,22 @@ public void addVariableInScope(String var)
         {
             this.getCppCode().append(MessageFormat.format("{0}auto& {1} = (*this)", this.getIndentationPrefix(),var));
         }
-        this.varName.push(Pair.of(var, false));
+        this.varName.push(Pair.of(var, false));   
+    }
+
+    public void cleanupVariablesCurrentScope()
+    {
+        while(!this.getVarName().isEmpty())
+        {
+            if(!this.getVarName().peek().right)
+            {
+                this.getVarName().pop();
+            }
+            else
+            {
+                break;
+            }
+        }
     }
 
     public void rangeBasedForLoop(String varName)
@@ -79,10 +95,7 @@ public void closeVariableScope()
     }
 
     public boolean isStartOfNewScope(){
-        return (
-                this.getCppCode().length() > 2 &&
-                this.getCppCode().substring(this.getCppCode().length() - 2).equals("{\n")
-            );
+        return (!this.getVarName().isEmpty())  && this.getVarName().peek().right;
     }
 
     public void addInScopeVariableToResult(Optional<String> accessorSuffix)