Skip to content

Commit 30b2df8

Browse files
committed
fix: fix compilation by using DEFAULT_COLLECTION
1 parent 7fd825a commit 30b2df8

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

core/src/main/java/io/substrait/extension/ExtensionCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private String getUriFromUrn(String urn) {
3030
}
3131

3232
public ExtensionCollector() {
33-
this(SimpleExtension.loadDefaults());
33+
this(DefaultExtensionCatalog.DEFAULT_COLLECTION);
3434
}
3535

3636
public ExtensionCollector(SimpleExtension.ExtensionCollection extensionCollection) {

core/src/main/java/io/substrait/extension/ImmutableExtensionLookup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static class Builder {
3535
private final SimpleExtension.ExtensionCollection extensionCollection;
3636

3737
public Builder() {
38-
this.extensionCollection = SimpleExtension.loadDefaults();
38+
this.extensionCollection = DefaultExtensionCatalog.DEFAULT_COLLECTION;
3939
}
4040

4141
public Builder(SimpleExtension.ExtensionCollection extensionCollection) {

core/src/main/java/io/substrait/plan/PlanProtoConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.substrait.plan;
22

3+
import io.substrait.extension.DefaultExtensionCatalog;
34
import io.substrait.extension.ExtensionCollector;
45
import io.substrait.extension.SimpleExtension;
56
import io.substrait.proto.Plan;
@@ -16,7 +17,7 @@ public class PlanProtoConverter {
1617
private final SimpleExtension.ExtensionCollection extensionCollection;
1718

1819
public PlanProtoConverter() {
19-
this(SimpleExtension.loadDefaults());
20+
this(DefaultExtensionCatalog.DEFAULT_COLLECTION);
2021
}
2122

2223
public PlanProtoConverter(SimpleExtension.ExtensionCollection extensionCollection) {

core/src/test/java/io/substrait/extension/UriUrnMigrationEndToEndTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*/
2727
public class UriUrnMigrationEndToEndTest {
2828

29-
private final SimpleExtension.ExtensionCollection defaultExtensions =
30-
SimpleExtension.loadDefaults();
31-
3229
/** Load a proto Plan from a JSON resource file using JsonFormat */
3330
private Plan loadPlanFromJson(String resourcePath) throws IOException {
3431
try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(resourcePath)) {
@@ -81,10 +78,12 @@ public void testUriUrnMigrationEndToEnd() throws IOException {
8178
Plan inputPlan = loadPlanFromJson(inputPath);
8279
Plan expectedPlan = loadPlanFromJson(expectedPath);
8380

84-
ProtoPlanConverter protoToPojo = new ProtoPlanConverter(defaultExtensions);
81+
ProtoPlanConverter protoToPojo =
82+
new ProtoPlanConverter(DefaultExtensionCatalog.DEFAULT_COLLECTION);
8583
io.substrait.plan.Plan pojoPlan = protoToPojo.from(inputPlan);
8684

87-
PlanProtoConverter pojoToProto = new PlanProtoConverter(defaultExtensions);
85+
PlanProtoConverter pojoToProto =
86+
new PlanProtoConverter(DefaultExtensionCatalog.DEFAULT_COLLECTION);
8887
Plan actualPlan = pojoToProto.toProto(pojoPlan);
8988

9089
assertEquals(expectedPlan, actualPlan);
@@ -95,7 +94,8 @@ public void testUriUrnMigrationEndToEnd() throws IOException {
9594
public void testUnresolvableUriThrowsException() throws IOException {
9695
Plan inputPlan = loadPlanFromJson("uri-urn-migration/unresolvable-uri-plan.json");
9796

98-
ProtoPlanConverter protoToPojo = new ProtoPlanConverter(defaultExtensions);
97+
ProtoPlanConverter protoToPojo =
98+
new ProtoPlanConverter(DefaultExtensionCatalog.DEFAULT_COLLECTION);
9999

100100
IllegalStateException exception =
101101
assertThrows(

0 commit comments

Comments
 (0)