Enables the extended information in NessieConfiguration

Builds on the API changes from projectnessie#6635 Fixes projectnessie#4993 Fixes projectnessie#5810
snazy · Apr 20, 2023 · b2d8faa · b2d8faa
1 parent b5bed0d
commit b2d8faa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/servers/jax-rs-tests/src/main/java/org/projectnessie/jaxrs/tests/BaseTestNessieApi.java b/servers/jax-rs-tests/src/main/java/org/projectnessie/jaxrs/tests/BaseTestNessieApi.java
@@ -204,6 +204,10 @@ public void config() throws NessieNotFoundException {
             NessieConfiguration::getDefaultBranch, NessieConfiguration::getMaxSupportedApiVersion)
         .containsExactly("main", 2);
 
+    if (isV2()) {
+      soft.assertThat(config.getNoAncestorHash()).isNotNull();
+    }
+
     soft.assertThat(api().getDefaultBranch())
         .extracting(Branch::getName, Branch::getHash)
         .containsExactly(config.getDefaultBranch(), EMPTY);

diff --git a/servers/services/src/main/java/org/projectnessie/services/impl/ConfigApiImpl.java b/servers/services/src/main/java/org/projectnessie/services/impl/ConfigApiImpl.java
@@ -19,6 +19,7 @@
 import org.projectnessie.model.NessieConfiguration;
 import org.projectnessie.services.config.ServerConfig;
 import org.projectnessie.services.spi.ConfigService;
+import org.projectnessie.versioned.RepositoryInformation;
 import org.projectnessie.versioned.VersionStore;
 
 public class ConfigApiImpl implements ConfigService {
@@ -33,9 +34,18 @@ public ConfigApiImpl(ServerConfig config, VersionStore store) {
 
   @Override
   public NessieConfiguration getConfig() {
+    RepositoryInformation info = store.getRepositoryInformation();
+    String defaultBranch = info.getDefaultBranch();
+    if (defaultBranch == null) {
+      defaultBranch = this.config.getDefaultBranch();
+    }
     return ImmutableNessieConfiguration.builder()
         .from(NessieConfiguration.getBuiltInConfig())
-        .defaultBranch(this.config.getDefaultBranch())
+        .defaultBranch(defaultBranch)
+        .noAncestorHash(info.getNoAncestorHash())
+        .repositoryCreationTimestamp(info.getRepositoryCreationTimestamp())
+        .oldestPossibleCommitTimestamp(info.getOldestPossibleCommitTimestamp())
+        .additionalProperties(info.getAdditionalProperties())
         .build();
   }
 }
diff --git a/servers/services/src/testFixtures/java/org/projectnessie/services/impl/AbstractTestMisc.java b/servers/services/src/testFixtures/java/org/projectnessie/services/impl/AbstractTestMisc.java
@@ -26,7 +26,6 @@
 import org.projectnessie.model.CommitMeta;
 import org.projectnessie.model.ContentKey;
 import org.projectnessie.model.IcebergTable;
-import org.projectnessie.model.ImmutableNessieConfiguration;
 import org.projectnessie.model.NessieConfiguration;
 import org.projectnessie.model.Operation.Put;
 import org.projectnessie.model.Operation.Unchanged;
@@ -50,12 +49,16 @@ public void testRepositoryInformation() {
   @Test
   public void testSupportedApiVersions() {
     NessieConfiguration serverConfig = configApi().getConfig();
-    NessieConfiguration expectedConfig =
-        ImmutableNessieConfiguration.builder()
-            .from(NessieConfiguration.getBuiltInConfig())
-            .defaultBranch(serverConfig.getDefaultBranch())
-            .build();
-    assertThat(serverConfig).isEqualTo(expectedConfig);
+    NessieConfiguration builtInConfig = NessieConfiguration.getBuiltInConfig();
+    assertThat(serverConfig)
+        .extracting(
+            NessieConfiguration::getMinSupportedApiVersion,
+            NessieConfiguration::getMaxSupportedApiVersion,
+            NessieConfiguration::getSpecVersion)
+        .containsExactly(
+            builtInConfig.getMinSupportedApiVersion(),
+            builtInConfig.getMaxSupportedApiVersion(),
+            builtInConfig.getSpecVersion());
   }
 
   @Test