This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 89e7e50bbb Nessie: Avoid usage of deprecated APIs in test (#6656)
89e7e50bbb is described below
commit 89e7e50bbb91ba8524a0d45e67d19869c1d29dce
Author: Ajantha Bhat <[email protected]>
AuthorDate: Mon Jan 30 19:43:19 2023 +0530
Nessie: Avoid usage of deprecated APIs in test (#6656)
* Nessie: Avoid usage of deprecated APIs in test
* Address comments
---
.../org/apache/iceberg/nessie/BaseTestIceberg.java | 21 +++++++++++---------
.../apache/iceberg/nessie/TestNessieCatalog.java | 23 +++++++++++-----------
.../org/apache/iceberg/nessie/TestNessieTable.java | 8 +++++---
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git
a/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java
b/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java
index c484983612..b66bbe1c42 100644
--- a/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java
+++ b/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java
@@ -48,15 +48,16 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.projectnessie.client.api.NessieApiV1;
-import org.projectnessie.client.http.HttpClientBuilder;
+import org.projectnessie.client.ext.NessieApiVersion;
+import org.projectnessie.client.ext.NessieApiVersions;
+import org.projectnessie.client.ext.NessieClientFactory;
+import org.projectnessie.client.ext.NessieClientUri;
import org.projectnessie.error.NessieConflictException;
import org.projectnessie.error.NessieNotFoundException;
import org.projectnessie.jaxrs.ext.NessieJaxRsExtension;
-import org.projectnessie.jaxrs.ext.NessieUri;
import org.projectnessie.model.Branch;
import org.projectnessie.model.Reference;
import org.projectnessie.model.Tag;
-import org.projectnessie.server.store.TableCommitMetaStoreWorker;
import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
import
org.projectnessie.versioned.persist.inmem.InmemoryDatabaseAdapterFactory;
import
org.projectnessie.versioned.persist.inmem.InmemoryTestConnectionProviderSource;
@@ -70,13 +71,14 @@ import org.slf4j.LoggerFactory;
@ExtendWith(DatabaseAdapterExtension.class)
@NessieDbAdapterName(InmemoryDatabaseAdapterFactory.NAME)
@NessieExternalDatabase(InmemoryTestConnectionProviderSource.class)
+@NessieApiVersions(versions = NessieApiVersion.V1)
public abstract class BaseTestIceberg {
- @NessieDbAdapter(storeWorker = TableCommitMetaStoreWorker.class)
- static DatabaseAdapter databaseAdapter;
+ @NessieDbAdapter static DatabaseAdapter databaseAdapter;
@RegisterExtension
- static NessieJaxRsExtension server = new NessieJaxRsExtension(() ->
databaseAdapter);
+ static NessieJaxRsExtension server =
+ NessieJaxRsExtension.jaxRsExtensionForDatabaseAdapter(() ->
databaseAdapter);
private static final Logger LOG =
LoggerFactory.getLogger(BaseTestIceberg.class);
@@ -114,9 +116,10 @@ public abstract class BaseTestIceberg {
}
@BeforeEach
- public void beforeEach(@NessieUri URI nessieUri) throws IOException {
- this.uri = nessieUri.toString();
- this.api =
HttpClientBuilder.builder().withUri(this.uri).build(NessieApiV1.class);
+ public void beforeEach(NessieClientFactory clientFactory, @NessieClientUri
URI nessieUri)
+ throws IOException {
+ this.uri = nessieUri.toASCIIString();
+ this.api = clientFactory.make();
Branch defaultBranch = api.getDefaultBranch();
initialHashOfDefaultBranch = defaultBranch.getHash();
diff --git
a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieCatalog.java
b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieCatalog.java
index ba9a3b4c65..080ad860bc 100644
--- a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieCatalog.java
+++ b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieCatalog.java
@@ -33,15 +33,16 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.projectnessie.client.api.NessieApiV1;
-import org.projectnessie.client.http.HttpClientBuilder;
+import org.projectnessie.client.ext.NessieApiVersion;
+import org.projectnessie.client.ext.NessieApiVersions;
+import org.projectnessie.client.ext.NessieClientFactory;
+import org.projectnessie.client.ext.NessieClientUri;
import org.projectnessie.error.NessieConflictException;
import org.projectnessie.error.NessieNotFoundException;
import org.projectnessie.jaxrs.ext.NessieJaxRsExtension;
-import org.projectnessie.jaxrs.ext.NessieUri;
import org.projectnessie.model.Branch;
import org.projectnessie.model.Reference;
import org.projectnessie.model.Tag;
-import org.projectnessie.server.store.TableCommitMetaStoreWorker;
import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
import
org.projectnessie.versioned.persist.inmem.InmemoryDatabaseAdapterFactory;
import
org.projectnessie.versioned.persist.inmem.InmemoryTestConnectionProviderSource;
@@ -53,13 +54,14 @@ import
org.projectnessie.versioned.persist.tests.extension.NessieExternalDatabas
@ExtendWith(DatabaseAdapterExtension.class)
@NessieDbAdapterName(InmemoryDatabaseAdapterFactory.NAME)
@NessieExternalDatabase(InmemoryTestConnectionProviderSource.class)
+@NessieApiVersions(versions = NessieApiVersion.V1)
public class TestNessieCatalog extends CatalogTests<NessieCatalog> {
- @NessieDbAdapter(storeWorker = TableCommitMetaStoreWorker.class)
- static DatabaseAdapter databaseAdapter;
+ @NessieDbAdapter static DatabaseAdapter databaseAdapter;
@RegisterExtension
- static NessieJaxRsExtension server = new NessieJaxRsExtension(() ->
databaseAdapter);
+ static NessieJaxRsExtension server =
+ NessieJaxRsExtension.jaxRsExtensionForDatabaseAdapter(() ->
databaseAdapter);
@TempDir public Path temp;
@@ -70,12 +72,11 @@ public class TestNessieCatalog extends
CatalogTests<NessieCatalog> {
private String uri;
@BeforeEach
- public void beforeEach(@NessieUri URI nessieUri) throws IOException {
- this.uri = nessieUri.toString();
- this.api =
HttpClientBuilder.builder().withUri(this.uri).build(NessieApiV1.class);
-
+ public void setUp(NessieClientFactory clientFactory, @NessieClientUri URI
nessieUri)
+ throws NessieNotFoundException {
+ api = clientFactory.make();
initialHashOfDefaultBranch = api.getDefaultBranch().getHash();
-
+ uri = nessieUri.toASCIIString();
hadoopConfig = new Configuration();
catalog = initNessieCatalog("main");
}
diff --git
a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
index 272cee2284..0207ea8109 100644
--- a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
+++ b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
@@ -52,9 +52,10 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.projectnessie.client.ext.NessieClientFactory;
+import org.projectnessie.client.ext.NessieClientUri;
import org.projectnessie.error.NessieConflictException;
import org.projectnessie.error.NessieNotFoundException;
-import org.projectnessie.jaxrs.ext.NessieUri;
import org.projectnessie.model.Branch;
import org.projectnessie.model.CommitMeta;
import org.projectnessie.model.ContentKey;
@@ -89,8 +90,9 @@ public class TestNessieTable extends BaseTestIceberg {
@Override
@BeforeEach
- public void beforeEach(@NessieUri URI uri) throws IOException {
- super.beforeEach(uri);
+ public void beforeEach(NessieClientFactory clientFactory, @NessieClientUri
URI nessieUri)
+ throws IOException {
+ super.beforeEach(clientFactory, nessieUri);
this.tableLocation =
catalog.createTable(TABLE_IDENTIFIER,
schema).location().replaceFirst("file:", "");
}
