Spotless

astefan · Aug 30, 2023 · 25d416f · 25d416f
1 parent 06293b8
commit 25d416f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/...lugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java b/...lugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java
@@ -81,15 +81,16 @@ public void execute(SqlSession session, ActionListener<Page> listener) {
         idx = hasText(cat) && cat.equals(cluster) == false ? buildRemoteIndexName(cat, idx) : idx;
 
         boolean withFrozen = includeFrozen || session.configuration().includeFrozen();
-        session.indexResolver().resolveAsMergedMapping(idx, IndexResolver.ALL_FIELDS, withFrozen, emptyMap(), ActionListener.wrap(indexResult -> {
-            List<List<?>> rows = emptyList();
-            if (indexResult.isValid()) {
-                rows = new ArrayList<>();
-                Version version = Version.fromId(session.configuration().version().id);
-                fillInRows(IndexCompatibility.compatible(indexResult, version).get().mapping(), null, rows);
-            }
-            listener.onResponse(of(session, rows));
-        }, listener::onFailure));
+        session.indexResolver()
+            .resolveAsMergedMapping(idx, IndexResolver.ALL_FIELDS, withFrozen, emptyMap(), ActionListener.wrap(indexResult -> {
+                List<List<?>> rows = emptyList();
+                if (indexResult.isValid()) {
+                    rows = new ArrayList<>();
+                    Version version = Version.fromId(session.configuration().version().id);
+                    fillInRows(IndexCompatibility.compatible(indexResult, version).get().mapping(), null, rows);
+                }
+                listener.onResponse(of(session, rows));
+            }, listener::onFailure));
     }
 
     static void fillInRows(Map<String, EsField> mapping, String prefix, List<List<?>> rows) {

diff --git a/...in/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysColumns.java b/...in/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysColumns.java
@@ -171,22 +171,23 @@ public void execute(SqlSession session, ActionListener<Page> listener) {
         }
         // otherwise use a merged mapping
         else {
-            session.indexResolver().resolveAsMergedMapping(indexPattern, IndexResolver.ALL_FIELDS, includeFrozen, emptyMap(), ActionListener.wrap(r -> {
-                List<List<?>> rows = new ArrayList<>();
-                // populate the data only when a target is found
-                if (r.isValid()) {
-                    fillInRows(
-                        tableCat,
-                        indexName,
-                        IndexCompatibility.compatible(r, version).get().mapping(),
-                        null,
-                        rows,
-                        columnMatcher,
-                        mode
-                    );
-                }
-                listener.onResponse(ListCursor.of(Rows.schema(output), rows, session.configuration().pageSize()));
-            }, listener::onFailure));
+            session.indexResolver()
+                .resolveAsMergedMapping(indexPattern, IndexResolver.ALL_FIELDS, includeFrozen, emptyMap(), ActionListener.wrap(r -> {
+                    List<List<?>> rows = new ArrayList<>();
+                    // populate the data only when a target is found
+                    if (r.isValid()) {
+                        fillInRows(
+                            tableCat,
+                            indexName,
+                            IndexCompatibility.compatible(r, version).get().mapping(),
+                            null,
+                            rows,
+                            columnMatcher,
+                            mode
+                        );
+                    }
+                    listener.onResponse(ListCursor.of(Rows.schema(output), rows, session.configuration().pageSize()));
+                }, listener::onFailure));
         }
     }