Moved DataInstructionsProviderLoader to iceberg,internal package

lbooker42 · Aug 28, 2024 · c4504a4 · c4504a4
1 parent 39c728d
commit c4504a4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/...ions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java b/...ions/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/.../util/DataInstructionsProviderLoader.java → ...ernal/DataInstructionsProviderLoader.java b/.../util/DataInstructionsProviderLoader.java → ...ernal/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/.../util/DataInstructionsProviderPlugin.java → ...ernal/DataInstructionsProviderPlugin.java b/.../util/DataInstructionsProviderPlugin.java → ...ernal/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
@@ -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
@@ -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/...s/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java b/...s/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
@@ -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;