Fix merge conflict error.

gorpipe · Dec 17, 2024 · 7cf6e01 · 7cf6e01
1 parent 6416f3e
commit 7cf6e01
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/drivers/src/test/java/org/gorpipe/oci/driver/UTestOCIObjectStorageSourceType.java b/drivers/src/test/java/org/gorpipe/oci/driver/UTestOCIObjectStorageSourceType.java
@@ -41,58 +41,58 @@ static public void setUpClass() {
     @Test
     public void testResolveGorOciUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("oci://gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("oci://gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, false));
         assertEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
 
         source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("oc://gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("oc://gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, false));
         assertEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }
 
     @Test
     public void testResolveOciHttpUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("https://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("https://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null,  false));
         assertEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
 
         source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("http://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("http://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, false));
         assertEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }
 
     @Test
     public void testResolveOciNativeHttpUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("https://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/n/namespace/b/gdb_gor_test_data_dev/o/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("https://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/n/namespace/b/gdb_gor_test_data_dev/o/the/path.dat", securityContext(), null, null, null, false));
         assertEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }
 
     @Test
     public void testResolveNonOciHttpUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("https://some.address.com/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("https://some.address.com/the/path.dat", securityContext(), null, null, null,  false));
         assertNotEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
 
         source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("https://some.address.com/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("https://some.address.com/the/path.dat", securityContext(), null, null, null,  false));
         assertNotEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }
 
     @Test
     public void testResolveS3HttpUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("https://s3.us-east1.amazonaws.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("https://s3.us-east1.amazonaws.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null,  false));
         assertNotEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
 
         source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("http://s3.us-east1.amazonaws.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("http://s3.us-east1.amazonaws.com/gdb_gor_test_data_dev/the/path.dat", securityContext(), null, null, null,  false));
         assertNotEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }
 
     @Test
     public void testResolveS3OciHttpUrl() throws IOException {
         var source = GorDriverFactory.fromConfig().resolveDataSource(
-                new SourceReference("s3://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/the/path.dat", securityContext(), null, null, null, null, false));
+                new SourceReference("s3://namespace.objectstorage.us-ashburn-1.oci.customer-oci.com/the/path.dat", securityContext(), null, null, null,  false));
         assertNotEquals(OCIObjectStorageSourceType.OCI_OBJECT_STORAGE, source.getSourceType());
     }