Updated GET views to use new array format

Author: craigtaverner

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/GetViewAction.java

@@ -21,12 +21,10 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.TreeMap;
-
-import static org.elasticsearch.xpack.esql.view.ViewMetadata.VIEWS;
 
 public class GetViewAction extends ActionType<GetViewAction.Response> {
 
@@ -75,15 +73,14 @@ public int hashCode() {
 
     public static class Response extends ActionResponse implements ToXContentObject {
 
-        private final Map<String, View> views;
+        private final List<View> views;
 
-        public Response(Map<String, View> views) {
+        public Response(List<View> views) {
             Objects.requireNonNull(views, "views cannot be null");
-            // use a treemap to guarantee ordering in the set, then transform it to the list of named policies
-            this.views = new TreeMap<>(views);
+            this.views = Collections.unmodifiableList(views);
         }
 
-        public Map<String, View> getViews() {
+        public List<View> getViews() {
             return views;
         }
 
@@ -95,7 +92,7 @@ public void writeTo(StreamOutput out) throws IOException {
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject();
-            var v = ChunkedToXContentHelper.xContentObjectFieldObjects(VIEWS.getPreferredName(), views);
+            var v = ChunkedToXContentHelper.array("views", new ViewMetadata.ViewIterator(views));
             while (v.hasNext()) {
                 v.next().toXContent(builder, params);
             }
@@ -121,7 +118,7 @@ public int hashCode() {
 
         @Override
         public String toString() {
-            return "GetViewAction.Response" + views.keySet();
+            return "GetViewAction.Response" + views.stream().map(View::name).toList();
         }
     }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/TransportGetViewAction.java

@@ -27,7 +27,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.TreeMap;
 
 public class TransportGetViewAction extends TransportLocalProjectMetadataAction<GetViewAction.Request, GetViewAction.Response> {
     public static final ActionType<RemoteInfoResponse> TYPE = new ActionType<>(GetViewAction.NAME);
@@ -60,7 +59,7 @@ protected void localClusterStateOperation(
         ActionListener<GetViewAction.Response> listener
     ) {
         ProjectId projectId = project.projectId();
-        TreeMap<String, View> views = new TreeMap<>();
+        List<View> views = new ArrayList<>();
         List<String> missing = new ArrayList<>();
         Collection<String> names = request.names();
         if (names.isEmpty()) {
@@ -71,7 +70,7 @@ protected void localClusterStateOperation(
             if (view == null) {
                 missing.add(name);
             } else {
-                views.put(name, view);
+                views.add(view);
             }
         }
         if (missing.isEmpty() == false) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/ViewMetadata.java

@@ -113,11 +113,15 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params ignored) {
-        return ChunkedToXContentHelper.array(VIEWS.getPreferredName(), new ViewIterator());
+        return ChunkedToXContentHelper.array(VIEWS.getPreferredName(), new ViewIterator(views));
     }
 
-    private class ViewIterator implements Iterator<ToXContent> {
-        private final Iterator<View> internal = views.iterator();
+    static class ViewIterator implements Iterator<ToXContent> {
+        private final Iterator<View> internal;
+
+        ViewIterator(List<View> views) {
+            this.internal = views.iterator();
+        }
 
         @Override
         public boolean hasNext() {

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/view/AbstractViewTestCase.java

@@ -18,7 +18,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -74,7 +73,7 @@ protected void delete(String name) throws Exception {
             }
         }
 
-        public Map<String, View> get(String... names) throws Exception {
+        public List<View> get(String... names) throws Exception {
             if (names == null || (names.length == 1 && names[0] == null)) {
                 // This is only for consistent testing, in production this is already checked in the REST API
                 throw new IllegalArgumentException("name is missing or empty");

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/view/ViewCrudTests.java

@@ -15,15 +15,15 @@
 import org.junit.rules.TestRule;
 import org.junit.runners.model.Statement;
 
-import java.util.Map;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.xpack.esql.plugin.EsqlFeatures.ESQL_VIEWS_FEATURE_FLAG;
 import static org.elasticsearch.xpack.esql.view.ViewTests.randomName;
 import static org.elasticsearch.xpack.esql.view.ViewTests.randomView;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 
 public class ViewCrudTests extends AbstractViewTestCase {
@@ -167,11 +167,11 @@ public void testGetValidation() throws Exception {
         );
     }
 
-    private void assertView(Map<String, View> result, String name, View view) {
+    private void assertView(List<View> result, String name, View view) {
         assertThat(result.size(), equalTo(1));
-        View found = result.get(name);
-        assertThat(found, not(nullValue()));
-        assertThat(found, equalTo(view));
+        Optional<View> found = result.stream().filter(v -> v.name().equals(name)).findFirst();
+        assertFalse(found.isEmpty());
+        assertThat(found.get(), equalTo(view));
     }
 
     private void assertViewMissing(TestViewsApi viewsApi, String name, int viewCount) throws Exception {