Add convenience Content.withId(String) (#6937)

api/client/src/main/java/org/projectnessie/client/util/v2api/ClientSideCreateNamespace.java

@@ -31,7 +31,6 @@
 import org.projectnessie.model.Content;
 import org.projectnessie.model.ContentKey;
 import org.projectnessie.model.GetMultipleContentsResponse;
-import org.projectnessie.model.ImmutableNamespace;
 import org.projectnessie.model.Namespace;
 import org.projectnessie.model.Operation.Put;
 
@@ -61,7 +60,7 @@ public CreateNamespaceResult createWithResponse()
       throw new IllegalArgumentException("Creating empty namespaces is not supported");
     }
 
-    ImmutableNamespace content = Namespace.builder().from(namespace).properties(properties).build();
+    Namespace content = Namespace.builder().from(namespace).properties(properties).build();
     ContentKey key = namespace.toContentKey();
 
     GetMultipleContentsResponse contentsResponse;

api/model/src/main/java/org/projectnessie/model/CommitResponse.java

@@ -61,6 +61,30 @@ default Map<ContentKey, String> toAddedContentsMap() {
     return added.stream().collect(Collectors.toMap(AddedContent::getKey, AddedContent::contentId));
   }
 
+  /**
+   * If new content has been added to Nessie for the given {@link ContentKey key}, updates the
+   * {@link Content#getId() content ID} of the given {@link Content content} with the content ID
+   * returned by Nessie.
+   *
+   * <p>Returns the {@code content} parameter value, if no content for the given {@code key} has
+   * been added.
+   *
+   * <p>Note: This convenience function only works for REST API v2.
+   */
+  @SuppressWarnings("unchecked")
+  default <T extends Content> T contentWithAssignedId(ContentKey key, T content) {
+    List<AddedContent> addedContents = getAddedContents();
+    if (addedContents == null) {
+      throw new UnsupportedOperationException("toAddedContentsMap is not available in API v1");
+    }
+    return (T)
+        getAddedContents().stream()
+            .filter(added -> added.getKey().equals(key))
+            .findFirst()
+            .map(added -> content.withId(added.contentId()))
+            .orElse(content);
+  }
+
   @Value.Immutable
   @JsonSerialize(as = ImmutableAddedContent.class)
   @JsonDeserialize(as = ImmutableAddedContent.class)

api/model/src/main/java/org/projectnessie/model/Content.java

@@ -97,6 +97,8 @@ public interface Type {
   @JsonIgnore
   public abstract Type getType();
 
+  public abstract Content withId(String id);
+
   /**
    * Unwrap object if possible, otherwise throw.
    *

api/model/src/main/java/org/projectnessie/model/DeltaLakeTable.java

@@ -45,4 +45,7 @@ public abstract class DeltaLakeTable extends Content {
   public Type getType() {
     return Type.DELTA_LAKE_TABLE;
   }
+
+  @Override
+  public abstract DeltaLakeTable withId(String id);
 }

api/model/src/main/java/org/projectnessie/model/IcebergTable.java

@@ -94,6 +94,9 @@ public Type getType() {
   // To be removed when API v1 gets removed.
   public abstract Map<String, Object> getMetadata();
 
+  @Override
+  public abstract IcebergTable withId(String id);
+
   public static ImmutableIcebergTable.Builder builder() {
     return ImmutableIcebergTable.builder();
   }

api/model/src/main/java/org/projectnessie/model/IcebergView.java

@@ -73,6 +73,9 @@ public Type getType() {
   // To be removed when API v1 gets removed.
   public abstract Map<String, Object> getMetadata();
 
+  @Override
+  public abstract IcebergView withId(String id);
+
   public static ImmutableIcebergView.Builder builder() {
     return ImmutableIcebergView.builder();
   }

api/model/src/main/java/org/projectnessie/model/Namespace.java

@@ -104,6 +104,9 @@ public Namespace getParent() {
   @JsonInclude(Include.NON_EMPTY)
   public abstract Map<String, String> getProperties();
 
+  @Override
+  public abstract Namespace withId(String id);
+
   /**
    * Builds a {@link Namespace} using the elements of the given content key.
    *

api/model/src/main/java/org/projectnessie/model/UDF.java

@@ -44,6 +44,9 @@ public Type getType() {
     return Type.UDF;
   }
 
+  @Override
+  public abstract UDF withId(String id);
+
   public static ImmutableUDF.Builder builder() {
     return ImmutableUDF.builder();
   }

api/model/src/test/java/org/projectnessie/model/TestCommitResponse.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 Dremio
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.projectnessie.model;
+
+import static org.projectnessie.model.CommitResponse.AddedContent.addedContent;
+
+import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions;
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(SoftAssertionsExtension.class)
+public class TestCommitResponse {
+  @InjectSoftAssertions protected SoftAssertions soft;
+
+  @Test
+  void addedContentKey() {
+    Branch branch = Branch.of("branch", "11223344");
+    IcebergTable table = IcebergTable.of("x", 1, 2, 3, 4);
+
+    // REST API v1
+    soft.assertThatThrownBy(
+            () ->
+                CommitResponse.builder()
+                    .targetBranch(branch)
+                    .build()
+                    .contentWithAssignedId(ContentKey.of("foo"), table))
+        .isInstanceOf(UnsupportedOperationException.class);
+
+    // REST API v2 cases
+    soft.assertThat(
+            CommitResponse.builder()
+                .addAddedContents(addedContent(ContentKey.of("bar"), "1234"))
+                .targetBranch(branch)
+                .build()
+                .contentWithAssignedId(ContentKey.of("foo"), table))
+        .isSameAs(table);
+    soft.assertThat(
+            CommitResponse.builder()
+                .addAddedContents(addedContent(ContentKey.of("foo"), "1234"))
+                .targetBranch(branch)
+                .build()
+                .contentWithAssignedId(ContentKey.of("foo"), table))
+        .isEqualTo(table.withId("1234"));
+  }
+}

events/service/src/test/java/org/projectnessie/events/service/util/TestContentMapping.java

@@ -265,5 +265,10 @@ public CommitMeta getCommitMeta() {
           .commitTime(Instant.ofEpochMilli(1234567890L))
           .build();
     }
+
+    @Override
+    public MyCustomContent withId(String id) {
+      throw new UnsupportedOperationException();
+    }
   }
 }

gc/gc-base/src/test/java/org/projectnessie/gc/repository/TestNessieRepositoryConnector.java

@@ -57,7 +57,6 @@
 import org.projectnessie.versioned.storage.testextension.NessieBackend;
 import org.projectnessie.versioned.storage.testextension.NessiePersist;
 import org.projectnessie.versioned.storage.testextension.PersistExtension;
-import org.projectnessie.versioned.store.DefaultStoreWorker;
 
 @ExtendWith({PersistExtension.class, SoftAssertionsExtension.class})
 @NessieBackend(InmemoryBackendTestFactory.class)
@@ -125,9 +124,7 @@ public void commitLog() throws Exception {
                     op -> {
                       if (op instanceof Operation.Put) {
                         return Operation.Put.of(
-                            op.getKey(),
-                            DefaultStoreWorker.instance()
-                                .applyId(((Operation.Put) op).getContent(), null));
+                            op.getKey(), ((Operation.Put) op).getContent().withId(null));
                       }
                       return op;
                     })
@@ -177,10 +174,7 @@ public void allContents() throws Exception {
             nessie.allContents(
                 Detached.of(current.getKey()), singleton(Content.Type.ICEBERG_TABLE))) {
           soft.assertThat(contents)
-              .map(
-                  e ->
-                      Maps.immutableEntry(
-                          e.getKey(), DefaultStoreWorker.instance().applyId(e.getValue(), null)))
+              .map(e -> Maps.immutableEntry(e.getKey(), e.getValue().withId(null)))
               .containsExactlyInAnyOrderElementsOf(expectedContents.entrySet());
         }
       }

servers/jax-rs-tests/src/main/java/org/projectnessie/jaxrs/tests/BaseTestNessieApi.java

@@ -187,7 +187,11 @@ protected CommitMultipleOperationsBuilder prepCommit(
   }
 
   protected Put dummyPut(String... elements) {
-    return Put.of(ContentKey.of(elements), IcebergTable.of("foo", 1, 2, 3, 4));
+    return Put.of(ContentKey.of(elements), dummyTable());
+  }
+
+  private static IcebergTable dummyTable() {
+    return IcebergTable.of("foo", 1, 2, 3, 4);
   }
 
   protected boolean fullPagingSupport() {
@@ -466,6 +470,15 @@ public void commitMergeTransplant() throws Exception {
           .hasSize(2)
           .extracting(AddedContent::getKey)
           .containsExactlyInAnyOrder(ContentKey.of("b", "a"), ContentKey.of("b", "b"));
+      soft.assertThat(resp.contentWithAssignedId(ContentKey.of("b", "a"), dummyTable()))
+          .extracting(IcebergTable::getId)
+          .isNotNull();
+      soft.assertThat(resp.contentWithAssignedId(ContentKey.of("b", "b"), dummyTable()))
+          .extracting(IcebergTable::getId)
+          .isNotNull();
+      soft.assertThat(resp.contentWithAssignedId(ContentKey.of("x", "y"), dummyTable()))
+          .extracting(IcebergTable::getId)
+          .isNull();
     } else {
       branch = prepCommit(branch, "one", dummyPut("a", "a")).commit();
       branch = prepCommit(branch, "two", dummyPut("b", "a"), dummyPut("b", "b")).commit();

servers/services/src/testFixtures/java/org/projectnessie/services/impl/AbstractTestContents.java

@@ -376,19 +376,7 @@ private Operation clearIdOnOperation(Operation o) {
   }
 
   private Content clearIdOnContent(Content content) {
-    return setIdOnContent(content, null);
-  }
-
-  private Content setIdOnContent(Content content, String contentId) {
-    try {
-      return (Content)
-          content
-              .getClass()
-              .getDeclaredMethod("withId", String.class)
-              .invoke(content, new Object[] {contentId});
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
+    return content.withId(null);
   }
 
   @Test

servers/services/src/testFixtures/java/org/projectnessie/services/impl/BaseTestServiceImpl.java

@@ -50,15 +50,12 @@
 import org.projectnessie.model.CommitResponse;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.ContentKey;
-import org.projectnessie.model.DeltaLakeTable;
 import org.projectnessie.model.Detached;
 import org.projectnessie.model.DiffResponse.DiffEntry;
 import org.projectnessie.model.EntriesResponse.Entry;
 import org.projectnessie.model.FetchOption;
 import org.projectnessie.model.GetMultipleContentsResponse.ContentWithKey;
 import org.projectnessie.model.IcebergTable;
-import org.projectnessie.model.IcebergView;
-import org.projectnessie.model.ImmutableDeltaLakeTable;
 import org.projectnessie.model.ImmutableOperations;
 import org.projectnessie.model.LogResponse.LogEntry;
 import org.projectnessie.model.Namespace;
@@ -67,7 +64,6 @@
 import org.projectnessie.model.Operations;
 import org.projectnessie.model.Reference;
 import org.projectnessie.model.Tag;
-import org.projectnessie.model.UDF;
 import org.projectnessie.services.authz.AbstractBatchAccessChecker;
 import org.projectnessie.services.authz.AccessContext;
 import org.projectnessie.services.authz.Authorizer;
@@ -575,37 +571,7 @@ protected static Content contentWithoutId(Content content) {
     if (content == null) {
       return null;
     }
-    if (content instanceof IcebergTable) {
-      IcebergTable t = (IcebergTable) content;
-      return IcebergTable.of(
-          t.getMetadataLocation(),
-          t.getSnapshotId(),
-          t.getSchemaId(),
-          t.getSpecId(),
-          t.getSortOrderId());
-    }
-    if (content instanceof IcebergView) {
-      IcebergView t = (IcebergView) content;
-      return IcebergView.of(
-          t.getMetadataLocation(),
-          t.getVersionId(),
-          t.getSchemaId(),
-          t.getDialect(),
-          t.getSqlText());
-    }
-    if (content instanceof UDF) {
-      UDF t = (UDF) content;
-      return UDF.of(t.getDialect(), t.getSqlText());
-    }
-    if (content instanceof DeltaLakeTable) {
-      DeltaLakeTable t = (DeltaLakeTable) content;
-      return ImmutableDeltaLakeTable.builder().from(t).id(null).build();
-    }
-    if (content instanceof Namespace) {
-      Namespace t = (Namespace) content;
-      return Namespace.of(t.getElements());
-    }
-    throw new IllegalArgumentException(content.toString());
+    return content.withId(null);
   }
 
   protected static DiffEntry diffEntryWithoutContentId(DiffEntry diff) {

servers/store/src/main/java/org/projectnessie/server/store/DeltaLakeTableSerializer.java

@@ -18,7 +18,6 @@
 import java.util.function.Supplier;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.DeltaLakeTable;
-import org.projectnessie.model.ImmutableDeltaLakeTable;
 import org.projectnessie.nessie.relocated.protobuf.ByteString;
 import org.projectnessie.server.store.proto.ObjectTypes;
 
@@ -47,11 +46,6 @@ protected void toStoreOnRefState(DeltaLakeTable content, ObjectTypes.Content.Bui
     builder.setDeltaLakeTable(table);
   }
 
-  @Override
-  public DeltaLakeTable applyId(DeltaLakeTable content, String id) {
-    return ((ImmutableDeltaLakeTable) content).withId(id);
-  }
-
   @Override
   protected DeltaLakeTable valueFromStore(
       ObjectTypes.Content content, Supplier<ByteString> globalState) {

servers/store/src/main/java/org/projectnessie/server/store/IcebergTableSerializer.java

@@ -18,7 +18,6 @@
 import java.util.function.Supplier;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.IcebergTable;
-import org.projectnessie.model.ImmutableIcebergTable;
 import org.projectnessie.nessie.relocated.protobuf.ByteString;
 import org.projectnessie.server.store.proto.ObjectTypes;
 
@@ -47,11 +46,6 @@ protected void toStoreOnRefState(IcebergTable table, ObjectTypes.Content.Builder
     builder.setIcebergRefState(stateBuilder);
   }
 
-  @Override
-  public IcebergTable applyId(IcebergTable content, String id) {
-    return ((ImmutableIcebergTable) content).withId(id);
-  }
-
   @Override
   public boolean requiresGlobalState(ByteString content) {
     ObjectTypes.Content parsed = parse(content);

servers/store/src/main/java/org/projectnessie/server/store/IcebergViewSerializer.java

@@ -18,7 +18,6 @@
 import java.util.function.Supplier;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.IcebergView;
-import org.projectnessie.model.ImmutableIcebergView;
 import org.projectnessie.nessie.relocated.protobuf.ByteString;
 import org.projectnessie.server.store.proto.ObjectTypes;
 
@@ -47,11 +46,6 @@ protected void toStoreOnRefState(IcebergView view, ObjectTypes.Content.Builder b
     builder.setIcebergViewState(stateBuilder);
   }
 
-  @Override
-  public IcebergView applyId(IcebergView content, String id) {
-    return ((ImmutableIcebergView) content).withId(id);
-  }
-
   @Override
   public boolean requiresGlobalState(ByteString content) {
     ObjectTypes.Content parsed = parse(content);