random-mirrors/HybridRow
1
0
Fork 0
mirror of https://github.com/microsoft/HybridRow.git synced 2026-01-28 05:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'java/port-from-dotnet' of https://github.com/microsoft/HybridRow into java/port-from-dotnet

Browse Source 
# Conflicts:
#	java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java
#	java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/io/RowReaderTest.java
This commit is contained in:
David Noble
2019-09-23 11:32:29 -07:00
parent 9aca4d1b0b 463cc8aaa8
commit 9608e8d718
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java
View File

@@ -50,7 +50,11 @@ public class RowScanner implements AutoCloseable {
} }
} }
<<<<<<< HEAD
public static RowScanner open(@Nonnull Namespace namespace, @Nonnull File file) throws IOException { public static RowScanner open(@Nonnull Namespace namespace, @Nonnull File file) throws IOException {
=======
public static RowScanner of(@Nonnull Namespace namespace, @Nonnull File file) throws IOException {
>>>>>>> 463cc8aaa89552b84bbc60d95d58f9be3d12d8c1
checkNotNull(file, "expected non-null file"); checkNotNull(file, "expected non-null file");
@@ -68,12 +72,21 @@ public class RowScanner implements AutoCloseable {
return new RowScanner(resolver, data); return new RowScanner(resolver, data);
} }
<<<<<<< HEAD
public static RowScanner open(@Nonnull Namespace namespace, @Nonnull Path path) throws IOException { public static RowScanner open(@Nonnull Namespace namespace, @Nonnull Path path) throws IOException {
return RowScanner.open(namespace, requireNonNull(path, "expected non-null path").toFile()); return RowScanner.open(namespace, requireNonNull(path, "expected non-null path").toFile());
} }
public static RowScanner open(@Nonnull Namespace namespace, @Nonnull String path) throws IOException { public static RowScanner open(@Nonnull Namespace namespace, @Nonnull String path) throws IOException {
return RowScanner.open(namespace, new File(requireNonNull(path, "expected non-null path"))); return RowScanner.open(namespace, new File(requireNonNull(path, "expected non-null path")));
=======
public static RowScanner of(@Nonnull Namespace namespace, @Nonnull Path path) throws IOException {
return RowScanner.of(namespace, requireNonNull(path, "expected non-null path").toFile());
}
public static RowScanner of(@Nonnull Namespace namespace, @Nonnull String path) throws IOException {
return RowScanner.of(namespace, new File(requireNonNull(path, "expected non-null path")));
>>>>>>> 463cc8aaa89552b84bbc60d95d58f9be3d12d8c1
} }
public <TContext> Result visit(BiFunction<DataItem, TContext, Result> accept, TContext context) { public <TContext> Result visit(BiFunction<DataItem, TContext, Result> accept, TContext context) {