From 4fbe5db4280202da85889dc8db2d28bf16231ed4 Mon Sep 17 00:00:00 2001 From: "milos.colic" Date: Wed, 22 Jun 2022 17:37:40 +0100 Subject: [PATCH 1/2] Move code from io.delta.sharing.java to com.databricks.labs.delta.sharing.java. Update image alignment in README.md. --- README.md | 6 ++++-- docs/source/usage/DeltaSharing.rst | 6 +++--- docs/source/usage/TableReader.rst | 2 +- .../databricks/labs}/delta/sharing/java/DeltaSharing.java | 4 ++-- .../labs}/delta/sharing/java/DeltaSharingFactory.java | 4 ++-- .../sharing/java/adaptor/DeltaSharingJsonProvider.java | 4 ++-- .../sharing/java/adaptor/DeltaSharingProfileAdaptor.java | 4 ++-- .../delta/sharing/java/format/parquet/LocalInputFile.java | 4 ++-- .../delta/sharing/java/format/parquet/TableReader.java | 2 +- .../labs}/delta/sharing/java/DeltaSharingTestCase.java | 7 +++---- .../java/adaptor/DeltaSharingJsonProviderTestCase.java | 6 ++---- .../databricks/labs}/delta/sharing/java/mocks/Mocks.java | 2 +- .../sharing/java}/parquet/LocalInputFileTestCase.java | 7 +++---- .../delta/sharing/java}/parquet/TableReaderTestCase.java | 5 ++--- 14 files changed, 30 insertions(+), 33 deletions(-) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/DeltaSharing.java (98%) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/DeltaSharingFactory.java (94%) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java (93%) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java (93%) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/format/parquet/LocalInputFile.java (97%) rename src/main/java/{io => com/databricks/labs}/delta/sharing/java/format/parquet/TableReader.java (98%) rename src/test/java/{io => com/databricks/labs}/delta/sharing/java/DeltaSharingTestCase.java (92%) rename src/test/java/{io => com/databricks/labs}/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java (94%) rename src/test/java/{io => com/databricks/labs}/delta/sharing/java/mocks/Mocks.java (94%) rename src/test/java/{io/delta/sharing/java/format => com/databricks/labs/delta/sharing/java}/parquet/LocalInputFileTestCase.java (93%) rename src/test/java/{io/delta/sharing/java/format => com/databricks/labs/delta/sharing/java}/parquet/TableReaderTestCase.java (92%) diff --git a/README.md b/README.md index 8883a07..ffbb6bb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Delta Sharing Java Connector -drawing -drawing +drawing +drawing +
+
A java connector for [delta-sharing](https://delta.io/sharing/) that allows you to easily ingest data on any JVM. diff --git a/docs/source/usage/DeltaSharing.rst b/docs/source/usage/DeltaSharing.rst index ce93d07..a7a0005 100644 --- a/docs/source/usage/DeltaSharing.rst +++ b/docs/source/usage/DeltaSharing.rst @@ -12,8 +12,8 @@ Examples .. tabs:: .. code-tab:: java - import io.delta.sharing.java.DeltaSharingFactory; - import io.delta.sharing.java.DeltaSharing; + import com.databricks.labs.delta.sharing.java.DeltaSharingFactory; + import com.databricks.labs.delta.sharing.java.DeltaSharing; DeltaSharing sharing = DeltaSharingFactory .create( @@ -24,7 +24,7 @@ Examples .. code-tab:: scala - import io.delta.sharing.java.DeltaSharingFactory + import com.databricks.labs.delta.sharing.java.DeltaSharingFactory val sharing = DeltaSharingFactory .create( diff --git a/docs/source/usage/TableReader.rst b/docs/source/usage/TableReader.rst index de3730b..c63f16b 100644 --- a/docs/source/usage/TableReader.rst +++ b/docs/source/usage/TableReader.rst @@ -14,7 +14,7 @@ Examples .. tabs:: .. code-tab:: java - import io.delta.sharing.java.format.parquet.TableReader; + import com.databricks.labs.delta.sharing.java.format.parquet.TableReader; import org.apache.avro.generic.GenericRecord; TableReader tableReader = sharing.getTableReader(“table.coordinates”); diff --git a/src/main/java/io/delta/sharing/java/DeltaSharing.java b/src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharing.java similarity index 98% rename from src/main/java/io/delta/sharing/java/DeltaSharing.java rename to src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharing.java index 0aa9bd6..34522ac 100644 --- a/src/main/java/io/delta/sharing/java/DeltaSharing.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharing.java @@ -1,6 +1,6 @@ -package io.delta.sharing.java; +package com.databricks.labs.delta.sharing.java; -import io.delta.sharing.java.format.parquet.TableReader; +import com.databricks.labs.delta.sharing.java.format.parquet.TableReader; import io.delta.sharing.spark.DeltaSharingFileSystem; import io.delta.sharing.spark.DeltaSharingProfileProvider; import io.delta.sharing.spark.DeltaSharingRestClient; diff --git a/src/main/java/io/delta/sharing/java/DeltaSharingFactory.java b/src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharingFactory.java similarity index 94% rename from src/main/java/io/delta/sharing/java/DeltaSharingFactory.java rename to src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharingFactory.java index cef55a2..1575b2a 100644 --- a/src/main/java/io/delta/sharing/java/DeltaSharingFactory.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/DeltaSharingFactory.java @@ -1,6 +1,6 @@ -package io.delta.sharing.java; +package com.databricks.labs.delta.sharing.java; -import io.delta.sharing.java.adaptor.DeltaSharingJsonProvider; +import com.databricks.labs.delta.sharing.java.adaptor.DeltaSharingJsonProvider; import io.delta.sharing.spark.DeltaSharingProfileProvider; import io.delta.sharing.spark.DeltaSharingRestClient; import java.io.IOException; diff --git a/src/main/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java b/src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java similarity index 93% rename from src/main/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java rename to src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java index c4b5867..507d5ba 100644 --- a/src/main/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProvider.java @@ -1,4 +1,4 @@ -package io.delta.sharing.java.adaptor; +package com.databricks.labs.delta.sharing.java.adaptor; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -7,7 +7,7 @@ /** - * Loads {@link io.delta.sharing.spark.DeltaSharingProfileProvider} based on configuration provided + * Loads {@link DeltaSharingProfileProvider} based on configuration provided * as a JSON document. JSON document has to be a valid profile file document. Required fields are * checked inside the constructor method and the object creation will fail in case of breaking the * constraints. diff --git a/src/main/java/io/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java b/src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java similarity index 93% rename from src/main/java/io/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java rename to src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java index 65a7336..dc56e44 100644 --- a/src/main/java/io/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingProfileAdaptor.java @@ -1,4 +1,4 @@ -package io.delta.sharing.java.adaptor; +package com.databricks.labs.delta.sharing.java.adaptor; import io.delta.sharing.spark.DeltaSharingProfile; import scala.Option; @@ -66,7 +66,7 @@ public void setExpirationTime(String expirationTime) { * Java wrapper method that can generate Scala paired object. This is need to be able to abstract * from cross language APIs. * - * @return An equivalent instance of Scala {@link io.delta.sharing.spark.DeltaSharingProfile} + * @return An equivalent instance of Scala {@link DeltaSharingProfile} * class. */ public DeltaSharingProfile toProfile() { diff --git a/src/main/java/io/delta/sharing/java/format/parquet/LocalInputFile.java b/src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/LocalInputFile.java similarity index 97% rename from src/main/java/io/delta/sharing/java/format/parquet/LocalInputFile.java rename to src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/LocalInputFile.java index dba4535..b6034da 100644 --- a/src/main/java/io/delta/sharing/java/format/parquet/LocalInputFile.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/LocalInputFile.java @@ -1,4 +1,4 @@ -package io.delta.sharing.java.format.parquet; +package com.databricks.labs.delta.sharing.java.format.parquet; import java.io.EOFException; import java.io.FileNotFoundException; @@ -13,7 +13,7 @@ * Parquet InputFile with a local java.nio.Path. Adapted from https://github.com/haifengl/smile This * class is required to instantiate {@link org.apache.parquet.avro.AvroParquetReader} instances. */ -class LocalInputFile implements InputFile { +public class LocalInputFile implements InputFile { /** Local file object. */ private final RandomAccessFile input; diff --git a/src/main/java/io/delta/sharing/java/format/parquet/TableReader.java b/src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/TableReader.java similarity index 98% rename from src/main/java/io/delta/sharing/java/format/parquet/TableReader.java rename to src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/TableReader.java index c39ac90..6a9d391 100644 --- a/src/main/java/io/delta/sharing/java/format/parquet/TableReader.java +++ b/src/main/java/com/databricks/labs/delta/sharing/java/format/parquet/TableReader.java @@ -1,4 +1,4 @@ -package io.delta.sharing.java.format.parquet; +package com.databricks.labs.delta.sharing.java.format.parquet; import java.io.IOException; import java.nio.file.Path; diff --git a/src/test/java/io/delta/sharing/java/DeltaSharingTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/DeltaSharingTestCase.java similarity index 92% rename from src/test/java/io/delta/sharing/java/DeltaSharingTestCase.java rename to src/test/java/com/databricks/labs/delta/sharing/java/DeltaSharingTestCase.java index bdcd046..5ecccba 100644 --- a/src/test/java/io/delta/sharing/java/DeltaSharingTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/DeltaSharingTestCase.java @@ -1,8 +1,7 @@ -package io.delta.sharing.java; +package com.databricks.labs.delta.sharing.java; - -import io.delta.sharing.java.adaptor.DeltaSharingJsonProvider; -import io.delta.sharing.java.mocks.Mocks; +import com.databricks.labs.delta.sharing.java.adaptor.DeltaSharingJsonProvider; +import com.databricks.labs.delta.sharing.java.mocks.Mocks; import io.delta.sharing.spark.DeltaSharingProfileProvider; import io.delta.sharing.spark.model.Table; import java.io.IOException; diff --git a/src/test/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java similarity index 94% rename from src/test/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java rename to src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java index 7698fca..0ae93a1 100644 --- a/src/test/java/io/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java @@ -1,8 +1,8 @@ -package io.delta.sharing.java.adaptor; +package com.databricks.labs.delta.sharing.java.adaptor; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; -import io.delta.sharing.java.mocks.Mocks; +import com.databricks.labs.delta.sharing.java.mocks.Mocks; import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,8 +10,6 @@ /** * Test cases for Delta Sharing Json Provider. - * - * @throws JsonProcessingException for all problems encountered when processing Json */ public class DeltaSharingJsonProviderTestCase { diff --git a/src/test/java/io/delta/sharing/java/mocks/Mocks.java b/src/test/java/com/databricks/labs/delta/sharing/java/mocks/Mocks.java similarity index 94% rename from src/test/java/io/delta/sharing/java/mocks/Mocks.java rename to src/test/java/com/databricks/labs/delta/sharing/java/mocks/Mocks.java index 77bd965..15e7c7f 100644 --- a/src/test/java/io/delta/sharing/java/mocks/Mocks.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/mocks/Mocks.java @@ -1,4 +1,4 @@ -package io.delta.sharing.java.mocks; +package com.databricks.labs.delta.sharing.java.mocks; /** * Mock for provider json. diff --git a/src/test/java/io/delta/sharing/java/format/parquet/LocalInputFileTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java similarity index 93% rename from src/test/java/io/delta/sharing/java/format/parquet/LocalInputFileTestCase.java rename to src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java index 077014e..b3223eb 100644 --- a/src/test/java/io/delta/sharing/java/format/parquet/LocalInputFileTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java @@ -1,17 +1,16 @@ -package io.delta.sharing.java.format.parquet; +package com.databricks.labs.delta.sharing.java.parquet; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.file.Path; import java.nio.file.Paths; +import com.databricks.labs.delta.sharing.java.format.parquet.LocalInputFile; import org.apache.parquet.io.SeekableInputStream; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** * Test cases for local Input File. - * - * @throws IOException for all IO problems */ public class LocalInputFileTestCase { @@ -59,7 +58,7 @@ public void testReadByteBuffers() throws IOException { ByteBuffer byteBuffer = ByteBuffer.allocateDirect(8192 * 4); SeekableInputStream stream = localInputFile.newStream(); - Assertions.assertDoesNotThrow(() -> stream.reset(), "assert no exception for reset"); + Assertions.assertDoesNotThrow(stream::reset, "assert no exception for reset"); Assertions.assertDoesNotThrow(() -> stream.read(byteBuffer), "assert no exception for read with byte buffer"); diff --git a/src/test/java/io/delta/sharing/java/format/parquet/TableReaderTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java similarity index 92% rename from src/test/java/io/delta/sharing/java/format/parquet/TableReaderTestCase.java rename to src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java index 941e0a2..6552eb8 100644 --- a/src/test/java/io/delta/sharing/java/format/parquet/TableReaderTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java @@ -1,10 +1,11 @@ -package io.delta.sharing.java.format.parquet; +package com.databricks.labs.delta.sharing.java.parquet; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.LinkedList; import java.util.List; +import com.databricks.labs.delta.sharing.java.format.parquet.TableReader; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.junit.jupiter.api.Assertions; @@ -12,8 +13,6 @@ /** * Test cases for Table Reader. - * - * @throws IOException for all IO problems */ public class TableReaderTestCase { From a7bcdf53339f5b9d583156885331c5740203c04a Mon Sep 17 00:00:00 2001 From: "milos.colic" Date: Wed, 22 Jun 2022 17:47:57 +0100 Subject: [PATCH 2/2] Fix style issues with imports. --- .../sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java | 2 +- .../labs/delta/sharing/java/parquet/LocalInputFileTestCase.java | 2 +- .../labs/delta/sharing/java/parquet/TableReaderTestCase.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java index 0ae93a1..be9834d 100644 --- a/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/adaptor/DeltaSharingJsonProviderTestCase.java @@ -1,8 +1,8 @@ package com.databricks.labs.delta.sharing.java.adaptor; +import com.databricks.labs.delta.sharing.java.mocks.Mocks; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; -import com.databricks.labs.delta.sharing.java.mocks.Mocks; import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java index b3223eb..21de974 100644 --- a/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/LocalInputFileTestCase.java @@ -1,10 +1,10 @@ package com.databricks.labs.delta.sharing.java.parquet; +import com.databricks.labs.delta.sharing.java.format.parquet.LocalInputFile; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.file.Path; import java.nio.file.Paths; -import com.databricks.labs.delta.sharing.java.format.parquet.LocalInputFile; import org.apache.parquet.io.SeekableInputStream; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java index 6552eb8..b6c1528 100644 --- a/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java +++ b/src/test/java/com/databricks/labs/delta/sharing/java/parquet/TableReaderTestCase.java @@ -1,11 +1,11 @@ package com.databricks.labs.delta.sharing.java.parquet; +import com.databricks.labs.delta.sharing.java.format.parquet.TableReader; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.LinkedList; import java.util.List; -import com.databricks.labs.delta.sharing.java.format.parquet.TableReader; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.junit.jupiter.api.Assertions;