fix: Add datstream support into strategy mechanism to only query data…

… streams when that is actually supported
kuseman · Sep 12, 2024 · b50d99b · b50d99b
1 parent 2e4384c
commit b50d99b
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 2 deletions.
diff --git a/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java b/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java
@@ -39,4 +39,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java b/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java
@@ -22,4 +22,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java b/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java
@@ -8,4 +8,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java b/...builder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java
@@ -8,4 +8,10 @@ public boolean supportsTypes()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/...adbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java b/...adbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java
@@ -19,4 +19,7 @@ interface ElasticStrategy
 
     /** Returns whether this elastic needs the nested sort path in a nested object or a plain property */
     boolean wrapNestedSortPathInObject();
+
+    /** Returns true if this elastic supports data streams or not. */
+    boolean supportsDataStreams();
 }
diff --git a/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java b/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java
@@ -156,8 +156,12 @@ static ElasticsearchMeta getMeta(IQuerySession session, String catalogAlias, Str
                         }
                     }
 
-                    // Fetch data stream mappings
-                    appendDataStreamMappings(session, catalogAlias, endpoint, index, result);
+                    if (version.getStrategy()
+                            .supportsDataStreams())
+                    {
+                        // Fetch data stream mappings
+                        appendDataStreamMappings(session, catalogAlias, endpoint, index, result);
+                    }
 
                     return new ElasticsearchMeta(version, result);
                 });

diff --git a/...adbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java b/...adbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java
@@ -43,4 +43,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return true;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return true;
+    }
 }