sync submodules with main

Author: ZorinAnton

isthmus/src/main/java/io/substrait/isthmus/ExtensionUtils.java

@@ -1,5 +1,6 @@
 package io.substrait.isthmus;
 
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.calcite.SubstraitOperatorTable;
 import java.util.List;
@@ -28,7 +29,7 @@ public static SimpleExtension.ExtensionCollection getDynamicExtensions(
   }
 
   public static SimpleExtension.ExtensionCollection loadExtensions(List<String> yamlFunctionFiles) {
-    SimpleExtension.ExtensionCollection allExtensions = SimpleExtension.loadDefaults();
+    SimpleExtension.ExtensionCollection allExtensions = DefaultExtensionCatalog.DEFAULT_COLLECTION;
     if (yamlFunctionFiles != null && !yamlFunctionFiles.isEmpty()) {
       allExtensions = allExtensions.merge(SimpleExtension.load(yamlFunctionFiles));
     }

isthmus/src/main/java/io/substrait/isthmus/SqlConverterBase.java

@@ -1,5 +1,6 @@
 package io.substrait.isthmus;
 
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import org.apache.calcite.config.CalciteConnectionConfig;
 import org.apache.calcite.config.CalciteConnectionProperty;
@@ -55,6 +56,6 @@ protected SqlConverterBase(
   }
 
   protected SqlConverterBase(FeatureBoard features) {
-    this(features, SimpleExtension.loadDefaults());
+    this(features, DefaultExtensionCatalog.DEFAULT_COLLECTION);
   }
 }

isthmus/src/main/java/io/substrait/isthmus/SqlExpressionToSubstrait.java

@@ -3,6 +3,7 @@
 import io.substrait.extendedexpression.ExtendedExpression;
 import io.substrait.extendedexpression.ExtendedExpressionProtoConverter;
 import io.substrait.extendedexpression.ImmutableExtendedExpression.Builder;
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.calcite.SubstraitTable;
 import io.substrait.isthmus.expression.RexExpressionConverter;
@@ -34,7 +35,7 @@ public class SqlExpressionToSubstrait extends SqlConverterBase {
   protected final RexExpressionConverter rexConverter;
 
   public SqlExpressionToSubstrait() {
-    this(FEATURES_DEFAULT, SimpleExtension.loadDefaults());
+    this(FEATURES_DEFAULT, DefaultExtensionCatalog.DEFAULT_COLLECTION);
   }
 
   public SqlExpressionToSubstrait(

isthmus/src/main/java/io/substrait/isthmus/SqlToSubstrait.java

@@ -1,5 +1,6 @@
 package io.substrait.isthmus;
 
+import io.substrait.extension.DefaultExtensionCatalog;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.calcite.SubstraitOperatorTable;
 import io.substrait.isthmus.sql.SubstraitSqlToCalcite;
@@ -19,11 +20,11 @@ public class SqlToSubstrait extends SqlConverterBase {
   private final SqlOperatorTable operatorTable;
 
   public SqlToSubstrait() {
-    this(SimpleExtension.loadDefaults(), null);
+    this(DefaultExtensionCatalog.DEFAULT_COLLECTION, null);
   }
 
   public SqlToSubstrait(FeatureBoard features) {
-    this(SimpleExtension.loadDefaults(), features);
+    this(DefaultExtensionCatalog.DEFAULT_COLLECTION, features);
   }
 
   public SqlToSubstrait(SimpleExtension.ExtensionCollection extensions, FeatureBoard features) {