From c4504a4e7a98b98eec31637c865fa80253da798a Mon Sep 17 00:00:00 2001 From: Larry Booker Date: Wed, 28 Aug 2024 12:00:48 -0700 Subject: [PATCH] Moved DataInstructionsProviderLoader to iceberg,internal package --- .../deephaven/iceberg/util/S3InstructionsProviderPlugin.java | 5 +++-- .../{util => internal}/DataInstructionsProviderLoader.java | 2 +- .../{util => internal}/DataInstructionsProviderPlugin.java | 2 +- .../java/io/deephaven/iceberg/layout/IcebergBaseLayout.java | 2 +- .../java/io/deephaven/iceberg/layout/IcebergFlatLayout.java | 2 +- .../iceberg/layout/IcebergKeyValuePartitionedLayout.java | 2 +- .../io/deephaven/iceberg/util/IcebergCatalogAdapter.java | 1 + 7 files changed, 9 insertions(+), 7 deletions(-) rename extensions/iceberg/src/main/java/io/deephaven/iceberg/{util => internal}/DataInstructionsProviderLoader.java (98%) rename extensions/iceberg/src/main/java/io/deephaven/iceberg/{util => internal}/DataInstructionsProviderPlugin.java (93%) diff --git a/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java index f5765857853..d55747d77b5 100644 --- a/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java +++ b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java @@ -6,6 +6,7 @@ import com.google.auto.service.AutoService; import io.deephaven.extensions.s3.Credentials; import io.deephaven.extensions.s3.S3Instructions; +import io.deephaven.iceberg.internal.DataInstructionsProviderPlugin; import org.apache.iceberg.aws.AwsClientProperties; import org.apache.iceberg.aws.s3.S3FileIOProperties; import org.jetbrains.annotations.NotNull; @@ -14,9 +15,9 @@ import java.util.Map; /** - * {@link DataInstructionsProviderPlugin} implementation used for reading files from S3. + * {@link io.deephaven.iceberg.internal.DataInstructionsProviderPlugin} implementation used for reading files from S3. */ -@AutoService(DataInstructionsProviderPlugin.class) +@AutoService(io.deephaven.iceberg.internal.DataInstructionsProviderPlugin.class) @SuppressWarnings("unused") public final class S3InstructionsProviderPlugin implements DataInstructionsProviderPlugin { @Override diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderLoader.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java similarity index 98% rename from extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderLoader.java rename to extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java index 674b3e20bee..0f71316687f 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderLoader.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java @@ -1,7 +1,7 @@ // // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending // -package io.deephaven.iceberg.util; +package io.deephaven.iceberg.internal; import org.jetbrains.annotations.NotNull; diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderPlugin.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java similarity index 93% rename from extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderPlugin.java rename to extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java index c0748b98198..b0e48cc9166 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/DataInstructionsProviderPlugin.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java @@ -1,7 +1,7 @@ // // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending // -package io.deephaven.iceberg.util; +package io.deephaven.iceberg.internal; import org.jetbrains.annotations.NotNull; diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java index 4f993475ba9..7bf0f5222a2 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java @@ -11,7 +11,7 @@ import io.deephaven.iceberg.location.IcebergTableParquetLocationKey; import io.deephaven.iceberg.util.IcebergInstructions; import io.deephaven.parquet.table.ParquetInstructions; -import io.deephaven.iceberg.util.DataInstructionsProviderLoader; +import io.deephaven.iceberg.internal.DataInstructionsProviderLoader; import org.apache.iceberg.*; import org.apache.iceberg.io.FileIO; import org.jetbrains.annotations.NotNull; diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java index 7c8e01d5313..fd407d7702e 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java @@ -7,7 +7,7 @@ import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder; import io.deephaven.iceberg.location.IcebergTableLocationKey; import io.deephaven.iceberg.util.IcebergInstructions; -import io.deephaven.iceberg.util.DataInstructionsProviderLoader; +import io.deephaven.iceberg.internal.DataInstructionsProviderLoader; import org.apache.iceberg.*; import org.apache.iceberg.io.FileIO; import org.jetbrains.annotations.NotNull; diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java index 028a332ebd1..f1a3cc9a5ea 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java @@ -9,7 +9,7 @@ import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder; import io.deephaven.iceberg.location.IcebergTableLocationKey; import io.deephaven.iceberg.util.IcebergInstructions; -import io.deephaven.iceberg.util.DataInstructionsProviderLoader; +import io.deephaven.iceberg.internal.DataInstructionsProviderLoader; import io.deephaven.util.type.TypeUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.iceberg.*; diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java index a12b0b905b5..82819ee1d24 100644 --- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java +++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java @@ -18,6 +18,7 @@ import io.deephaven.engine.table.impl.sources.regioned.RegionedTableComponentFactoryImpl; import io.deephaven.engine.updategraph.UpdateSourceRegistrar; import io.deephaven.engine.util.TableTools; +import io.deephaven.iceberg.internal.DataInstructionsProviderLoader; import io.deephaven.iceberg.layout.IcebergFlatLayout; import io.deephaven.iceberg.layout.IcebergKeyValuePartitionedLayout; import io.deephaven.iceberg.location.IcebergTableLocationFactory;