Skip to content

(feat) Add write support for Soft Delete Aspect #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

(feat) Add write support for Soft Delete Aspect #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
827202d
Add write support for Soft Delete Aspect
jphui May 13, 2025
00c069f
add one more test
jphui May 13, 2025
23365b8
change validation approach
jphui May 13, 2025
5e59344
adjust for validation
jphui May 13, 2025
dab2402
Merge branch 'master' into jhui/deleteBackfillWrite
jphui Jun 5, 2025
5eb46ca
adjustments made post-review, need a screencap of db tho
jphui Jun 6, 2025
b50ca51
move file
jphui Jun 6, 2025
2b290ce
docs and removal
jphui Jun 6, 2025
72088c6
nit
jphui Jun 6, 2025
aa36443
final nit
jphui Jun 6, 2025
ca0d4b2
address comments
jphui Jun 10, 2025
9861b51
typo
jphui Jun 10, 2025
18b5851
fix tests and desc
jphui Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,19 @@ public <ASPECT extends RecordTemplate> int add(@Nonnull URN urn, @Nullable ASPEC
return addWithOptimisticLocking(urn, newValue, aspectClass, auditStamp, null, ingestionTrackingContext, isTestMode);
}

@Override
@Transactional
public <ASPECT extends RecordTemplate> int addWithOldValue(
Copy link
Contributor

@ZihanLi58 ZihanLi58 Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to have this new method?

Copy link
Contributor Author

@jphui jphui Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned in the Public DAO Api changes:

+ addWithOldValue() -- public helper is needed since the DAO is only aware of the public interface and NEEDS to be able to call functionality that can take advantage of an OldValue for writing

Otherwise, there will be an additional get() that's performed "below" this level in order to access this data.

@Nonnull URN urn,
@Nullable ASPECT oldValue,
@Nullable ASPECT newValue,
@Nonnull Class<ASPECT> aspectClass,
@Nonnull AuditStamp auditStamp,
@Nullable IngestionTrackingContext ingestionTrackingContext,
boolean isTestMode) {
return updateWithOptimisticLocking(urn, oldValue, newValue, aspectClass, auditStamp, null, ingestionTrackingContext, isTestMode);
}

@Override
public <ASPECT extends RecordTemplate> int addWithOptimisticLocking(
@Nonnull URN urn,
Expand All @@ -112,6 +125,18 @@ public <ASPECT extends RecordTemplate> int addWithOptimisticLocking(
@Nullable Timestamp oldTimestamp,
@Nullable IngestionTrackingContext ingestionTrackingContext,
boolean isTestMode) {
return updateWithOptimisticLocking(urn, null, newValue, aspectClass, auditStamp, oldTimestamp, ingestionTrackingContext, isTestMode);
}

private <ASPECT extends RecordTemplate> int updateWithOptimisticLocking(
@Nonnull URN urn,
@Nullable ASPECT oldValue,
@Nullable ASPECT newValue,
@Nonnull Class<ASPECT> aspectClass,
@Nonnull AuditStamp auditStamp,
@Nullable Timestamp oldTimestamp,
@Nullable IngestionTrackingContext ingestionTrackingContext,
boolean isTestMode) {

final long timestamp = auditStamp.hasTime() ? auditStamp.getTime() : System.currentTimeMillis();
final String actor = auditStamp.hasActor() ? auditStamp.getActor().toString() : DEFAULT_ACTOR;
Expand All @@ -136,9 +161,18 @@ public <ASPECT extends RecordTemplate> int addWithOptimisticLocking(
sqlUpdate.setParameter("a_urn", toJsonString(urn));
}

// newValue is null if aspect is to be soft-deleted.
// newValue is null if aspect is to be (soft-)deleted.
if (newValue == null) {
return sqlUpdate.setParameter("metadata", DELETED_VALUE).execute();
if (oldValue == null) {
// Shouldn't happen: shouldn't run delete() on an already-null/deleted aspect, or if calling to soft-delete, should
// pass in the old value.
// Since Old Schema logic that calls this method does NOT have access to the old value (without significant refactoring)
Copy link
Contributor

@kotkar-pallavi kotkar-pallavi Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be more helpful to throw an exception if it is NEW_SCHEMA or DUAL_SCHEMA and oldValue=null?

Copy link
Contributor Author

@jphui jphui Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would basically result in DAO failures for cases on the Old or Dual schemas, I think a warning log here should be sufficient for now.

// we make the decision to log a warning and proceed with the soft-deletion with an empty "deletedContent" value.
log.warn(String.format(
"OldValue should not be null when NewValue is null (soft-deletion). Urn: <%s> and aspect: <%s>", urn, aspectClass));
}
return sqlUpdate.setParameter("metadata", RecordUtils.toJsonString(
Copy link
Contributor

@kotkar-pallavi kotkar-pallavi Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curious if we have verified with deleting more than 1 aspect in unit tests.

Copy link
Contributor Author

@jphui jphui Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the testDeleteManyWithRelationshipRemoval() test has this:

...
    // soft delete the AspectFooBar and AspectFooBaz aspects
    Collection<EntityAspectUnion> deletedAspects =
        fooDao.deleteMany(fooUrn, new HashSet<>(Arrays.asList(AspectFooBar.class, AspectFooBaz.class)), _dummyAuditStamp);
...

createSoftDeletedAspect(aspectClass, oldValue, new Timestamp(timestamp), actor))).execute();
}

AuditedAspect auditedAspect = new AuditedAspect()
Expand All @@ -152,8 +186,8 @@ public <ASPECT extends RecordTemplate> int addWithOptimisticLocking(
auditedAspect.setEmitter(ingestionTrackingContext.getEmitter(), SetMode.IGNORE_NULL);
}

final String metadata = toJsonString(auditedAspect);
return sqlUpdate.setParameter("metadata", metadata).execute();
final String metadata = toJsonString(auditedAspect);
return sqlUpdate.setParameter("metadata", metadata).execute();
}

/**
Expand Down
35 changes: 29 additions & 6 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ protected <ASPECT extends RecordTemplate> long saveLatest(@Nonnull URN urn, @Non
}
}

insert(urn, newValue, aspectClass, newAuditStamp, LATEST_VERSION, trackingContext, isTestMode);
insert(urn, oldValue, newValue, aspectClass, newAuditStamp, LATEST_VERSION, trackingContext, isTestMode);
}

// This method will handle relationship ingestions and soft-deletions
Expand Down Expand Up @@ -784,7 +784,7 @@ protected <ASPECT extends RecordTemplate> AspectEntry<ASPECT> getLatest(@Nonnull
}
final ExtraInfo extraInfo = toExtraInfo(latest);

if (isSoftDeletedAspect(latest, aspectClass)) {
if (isSoftDeletedAspect(latest)) {
return new AspectEntry<>(null, extraInfo, true);
}

Expand Down Expand Up @@ -905,11 +905,34 @@ protected <ASPECT extends RecordTemplate> void updateWithOptimisticLocking(@Nonn
protected <ASPECT extends RecordTemplate> void insert(@Nonnull URN urn, @Nullable RecordTemplate value,
@Nonnull Class<ASPECT> aspectClass, @Nonnull AuditStamp auditStamp, long version,
@Nullable IngestionTrackingContext trackingContext, boolean isTestMode) {
final EbeanMetadataAspect aspect = buildMetadataAspectBean(urn, value, aspectClass, auditStamp, version);
insert(urn, null, value, aspectClass, auditStamp, version, trackingContext, isTestMode);
}

/**
* Insert that also takes the old value of the aspect into account. This argument is used in the case
* Aspect soft-deletion is supposed to occur (ie. adding null).
*
* <p>TODO: Figure out if this should be surfaced to {@link BaseLocalDAO}'s {@link BaseLocalDAO#insert} signature.
* Right now, since it only has 1 use case -- soft-deletion and doesn't intuitively fit into the idea of an "insert",
* we are keeping it here only.
*
* @param urn entity urn
* @param oldValue old value of the aspect
* @param newValue new value of the aspect
* @param aspectClass aspect class
* @param auditStamp audit stamp
* @param version version of the record
* @param trackingContext tracking context
* @param isTestMode test mode
*/
protected <ASPECT extends RecordTemplate> void insert(@Nonnull URN urn, @Nullable RecordTemplate oldValue,
@Nullable RecordTemplate newValue, @Nonnull Class<ASPECT> aspectClass, @Nonnull AuditStamp auditStamp, long version,
@Nullable IngestionTrackingContext trackingContext, boolean isTestMode) {
final EbeanMetadataAspect aspect = buildMetadataAspectBean(urn, newValue, aspectClass, auditStamp, version);
if (_schemaConfig != SchemaConfig.OLD_SCHEMA_ONLY && version == LATEST_VERSION) {
// insert() could be called when updating log table (moving current versions into new history version)
// the metadata entity tables shouldn't been updated.
_localAccess.add(urn, (ASPECT) value, aspectClass, auditStamp, trackingContext, isTestMode);
_localAccess.addWithOldValue(urn, (ASPECT) oldValue, (ASPECT) newValue, aspectClass, auditStamp, trackingContext, isTestMode);
}

// DO append change log table (metadata_aspect) if:
Expand Down Expand Up @@ -1459,7 +1482,7 @@ URN getUrn(@Nonnull String urn) {
@Nonnull
static <ASPECT extends RecordTemplate> Optional<ASPECT> toRecordTemplate(@Nonnull Class<ASPECT> aspectClass,
@Nonnull EbeanMetadataAspect aspect) {
if (isSoftDeletedAspect(aspect, aspectClass)) {
if (isSoftDeletedAspect(aspect)) {
return Optional.empty();
}
return Optional.of(RecordUtils.toRecordTemplate(aspectClass, aspect.getMetadata()));
Expand All @@ -1468,7 +1491,7 @@ static <ASPECT extends RecordTemplate> Optional<ASPECT> toRecordTemplate(@Nonnul
@Nonnull
static <ASPECT extends RecordTemplate> Optional<AspectWithExtraInfo<ASPECT>> toRecordTemplateWithExtraInfo(
@Nonnull Class<ASPECT> aspectClass, @Nonnull EbeanMetadataAspect aspect) {
if (aspect.getMetadata() == null || isSoftDeletedAspect(aspect, aspectClass)) {
if (aspect.getMetadata() == null || isSoftDeletedAspect(aspect)) {
return Optional.empty();
}
final ExtraInfo extraInfo = toExtraInfo(aspect);
Expand Down
23 changes: 22 additions & 1 deletion dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/IEbeanLocalAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public interface IEbeanLocalAccess<URN extends Urn> {
void setUrnPathExtractor(@Nonnull UrnPathExtractor<URN> urnPathExtractor);

/**
* Upsert aspect into entity table.
* Upsert aspect into entity table (without Optimistic Locking).
*
* @param <ASPECT> metadata aspect value
* @param urn entity urn
Expand All @@ -36,6 +36,27 @@ public interface IEbeanLocalAccess<URN extends Urn> {
<ASPECT extends RecordTemplate> int add(@Nonnull URN urn, @Nullable ASPECT newValue, @Nonnull Class<ASPECT> aspectClass,
@Nonnull AuditStamp auditStamp, @Nullable IngestionTrackingContext ingestionTrackingContext, boolean isTestMode);

/**
* Same as {@link #add(Urn, RecordTemplate, Class, AuditStamp, IngestionTrackingContext, boolean)} but takes into
* account the old value of the aspect.
*
* <p>TODO: Consider whether to deprecate the no-OldValue version of this method to avoid confusion.
* The only use case of the OldValue at the moment is to support soft-deletion (on the new schema).
*
* @param <ASPECT> metadata aspect value
* @param urn entity urn
* @param oldValue old aspect value in {@link RecordTemplate}
* @param newValue aspect value in {@link RecordTemplate}
* @param aspectClass class of the aspect
* @param auditStamp audit timestamp
* @param ingestionTrackingContext the ingestionTrackingContext of the MCE responsible for this update
* @param isTestMode whether the test mode is enabled or not
* @return number of rows inserted or updated
*/
<ASPECT extends RecordTemplate> int addWithOldValue(@Nonnull URN urn, @Nullable ASPECT oldValue, @Nullable ASPECT newValue,
@Nonnull Class<ASPECT> aspectClass, @Nonnull AuditStamp auditStamp, @Nullable IngestionTrackingContext ingestionTrackingContext,
boolean isTestMode);

/**
* Update aspect on entity table with optimistic locking. (compare-and-update on oldTimestamp).
*
Expand Down
69 changes: 51 additions & 18 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/utils/EBeanDAOUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.linkedin.metadata.query.LocalRelationshipValue;
import com.linkedin.metadata.query.RelationshipField;
import com.linkedin.metadata.query.UrnField;
import com.linkedin.metadata.validator.ValidationUtils;
import io.ebean.EbeanServer;
import io.ebean.SqlRow;
import java.lang.reflect.InvocationTargetException;
Expand Down Expand Up @@ -175,21 +176,6 @@ public static <T> boolean compareResults(@Nullable ListResult<T> resultOld, @Nul
return false;
}

/**
* Checks whether the aspect record has been soft deleted.
*
* @param aspect aspect value
* @param aspectClass the type of the aspect
* @return boolean representing whether the aspect record has been soft deleted
*/
public static <ASPECT extends RecordTemplate> boolean isSoftDeletedAspect(@Nonnull EbeanMetadataAspect aspect,
@Nonnull Class<ASPECT> aspectClass) {
// Convert metadata string to record template object
final RecordTemplate metadataRecord = RecordUtils.toRecordTemplate(aspectClass, aspect.getMetadata());
return metadataRecord.equals(DELETED_METADATA);
}


/**
* Read {@link SqlRow} list into a {@link EbeanMetadataAspect} list.
* @param sqlRows list of {@link SqlRow}
Expand Down Expand Up @@ -277,15 +263,37 @@ private static <ASPECT extends RecordTemplate> EbeanMetadataAspect readSqlRow(Sq
}

/**
* Checks whether the entity table record has been soft deleted.
* Checks whether a record is Soft Deleted.
*
* <p>NOTE: Since soft deleted aspects are modeled as a specific aspect type -- SoftDeletedAspect -- the ability
* to cast the aspect to a {@link SoftDeletedAspect} is sufficient to determine whether the aspect *is* Soft Deleted.
* In other words, there are no current use cases where we store a SoftDeletedAspect with the `gma_deleted` flag set to
* anything other than "true".
*
* <p>While the validation implemented additionally checks for the setting of the flag, NOTE that some usages of checking
* soft-deletion are followed by a deserialization call to {@link RecordUtils#toRecordTemplate(Class, String)}, which
* will fail when we try to deserialize a SoftDeletedAspect -- to another Aspect Type -- with the flag set to "false".
*
* @param sqlRow {@link SqlRow} result from MySQL server
* @param columnName column name of entity table
* @return boolean representing whether the aspect record has been soft deleted
*/
public static boolean isSoftDeletedAspect(@Nonnull SqlRow sqlRow, @Nonnull String columnName) {
return isSoftDeletedAspect(sqlRow.getString(columnName));
}

/**
* Same as {@link #isSoftDeletedAspect(SqlRow, String)}, but for {@link EbeanMetadataAspect}.
*/
public static boolean isSoftDeletedAspect(@Nonnull EbeanMetadataAspect aspect) {
return isSoftDeletedAspect(aspect.getMetadata());
}

private static boolean isSoftDeletedAspect(@Nonnull String metadata) {
try {
SoftDeletedAspect aspect = RecordUtils.toRecordTemplate(SoftDeletedAspect.class, sqlRow.getString(columnName));
return aspect.hasGma_deleted() && aspect.isGma_deleted();
Copy link
Contributor

@ZihanLi58 ZihanLi58 Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this change? old check does not work?

Copy link
Contributor

@ZihanLi58 ZihanLi58 Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In another word, I'm asking why not use isGma_deleted to check instead of checkin against schema?

Copy link
Contributor Author

@jphui jphui Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is explained the isSoftDeletedAspect() changes section:

 / *
   * Currently, there are no cases where the aspect is soft-deleted but this flag is NOT set to
   * true: the very existence of this Aspect type indicates soft-deletion. This is to say that
   * any aspect that is not soft-deleted will simply not exist -- cannot be cast -- as this type.
   * /

and also in the nearby documentation:

   * <p>This validation approach is necessary because many usages of checking soft-deletion are followed by
   * a deserialization call to {@link RecordUtils#toRecordTemplate(Class, String)}, which will fail if
   * we try to deserialize a SoftDeletedAspect -- to another Aspect Type -- with the flag set to "false".

Copy link
Contributor

@kotkar-pallavi kotkar-pallavi Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see your point from the explanation, but some confusion may arise later on why we are relying on the schema validation to check the state of aspect.
adding a comment, something like "If this is does not fir the model of a deleted aspect, it is not not deleted" might help. just a suggestion..

Copy link
Contributor Author

@jphui jphui Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks both for the input, I will include my validation steps as well but still ultimately keep the original check. Note a few things:

  1. the fact of the matter is still that in the case where this boolean is set to "false", there will be some DAO errors that will result from this due to the inability to parse the returned object...
  2. ... however, this is OK because right now there are no cases that set it to "false"

SoftDeletedAspect softDeletedAspect = RecordUtils.toRecordTemplate(SoftDeletedAspect.class, metadata);
ValidationUtils.validateAgainstSchema(softDeletedAspect);
return softDeletedAspect.hasGma_deleted() && softDeletedAspect.isGma_deleted();
} catch (Exception e) {
return false;
}
Expand Down Expand Up @@ -423,6 +431,31 @@ public static LocalRelationshipCriterion buildRelationshipFieldCriterion(LocalRe
return relationshipMap;
}

/**
* Create a soft deleted aspect with the given old value and timestamp.
*
* <p>TODO: Make oldValue @Nonnull once the Old Schema is completed deprecated OR if old schema write pathways are
* refactored to be able to process (retrieve and then write) the old value.
*
* @param aspectClass the class of the aspect
* @param oldValue the old value of the aspect
* @param deletedTimestamp the timestamp of the old value
* @param deletedBy the user who deleted the aspect
* @return a SoftDeletedAspect with the given old value and timestamp
*/
@Nonnull
public static <ASPECT extends RecordTemplate> SoftDeletedAspect createSoftDeletedAspect(
@Nonnull Class<ASPECT> aspectClass, @Nullable ASPECT oldValue, @Nonnull Timestamp deletedTimestamp, @Nonnull String deletedBy) {
SoftDeletedAspect softDeletedAspect = new SoftDeletedAspect().setGma_deleted(true)
.setCanonicalName(aspectClass.getCanonicalName())
.setDeletedTimestamp(deletedTimestamp.toString())
.setDeletedBy(deletedBy);
if (oldValue != null) {
softDeletedAspect.setDeletedContent(RecordUtils.toJsonString(oldValue));
}
return softDeletedAspect;
}

// Using the GmaAnnotationParser, extract the model type from the @gma.model annotation on any models.
private static ModelType parseModelTypeFromGmaAnnotation(RecordTemplate model) {
try {
Expand Down
4 changes: 2 additions & 2 deletions dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/EbeanLocalDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,7 +2432,7 @@ public void testGetSoftDeletedAspect() {

// latest version of metadata should be null
EbeanMetadataAspect aspect = getMetadata(urn, aspectName, 0);
assertTrue(isSoftDeletedAspect(aspect, AspectFoo.class));
assertTrue(isSoftDeletedAspect(aspect));
Optional<AspectFoo> fooOptional = dao.get(AspectFoo.class, urn);
assertFalse(fooOptional.isPresent());

Expand Down Expand Up @@ -2618,7 +2618,7 @@ public void testUndeleteSoftDeletedAspect() {
if (dao.isChangeLogEnabled()) {
// version=3 should correspond to soft deleted metadata
EbeanMetadataAspect aspect = getMetadata(urn, aspectName, 3);
assertTrue(isSoftDeletedAspect(aspect, AspectFoo.class));
assertTrue(isSoftDeletedAspect(aspect));
fooOptional = dao.get(AspectFoo.class, urn, 3);
assertFalse(fooOptional.isPresent());

Expand Down
59 changes: 57 additions & 2 deletions dao-impl/ebean-dao/src/test/java/com/linkedin/metadata/dao/utils/EBeanDAOUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.linkedin.data.template.RecordTemplate;
import com.linkedin.data.template.StringArray;
import com.linkedin.metadata.aspect.AuditedAspect;
import com.linkedin.metadata.aspect.SoftDeletedAspect;
import com.linkedin.metadata.dao.BaseLocalDAO;
import com.linkedin.metadata.dao.EbeanLocalAccess;
import com.linkedin.metadata.dao.EbeanMetadataAspect;
Expand Down Expand Up @@ -52,12 +53,14 @@
import static org.mockito.Mockito.*;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.*;


public class EBeanDAOUtilsTest {

final static String SOFT_DELETED_ASPECT_WITH_DELETED_CONTENT = "{\"gma_deleted\": true,"
+ "\"deletedContent\": \"{removed: false}\", \"canonicalName\": \"com.linkedin.common.Status\","
+ "\"deletedTimestamp\": \"0L\", \"deletedBy\": \"urn:li:tester\"}";

@Nonnull
private String readSQLfromFile(@Nonnull String resourcePath) {
Expand Down Expand Up @@ -573,6 +576,42 @@ public void testIsSoftDeletedAspect() {

when(sqlRow.getString("a_aspectbaz")).thenReturn("{\"random_value\": \"baz\"}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(sqlRow, "a_aspectbaz"));

when(sqlRow.getString("a_aspectbaz")).thenReturn("{\"random_value\": \"baz\"}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(sqlRow, "a_aspectbaz"));

when(sqlRow.getString("a_aspectqux")).thenReturn("{\"gma_deleted\": false}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(sqlRow, "a_aspectqux"));

when(sqlRow.getString("a_aspectbax")).thenReturn(SOFT_DELETED_ASPECT_WITH_DELETED_CONTENT);
assertTrue(EBeanDAOUtils.isSoftDeletedAspect(sqlRow, "a_aspectbax"));

when(sqlRow.getString("a_aspectbazz"))
.thenReturn("input that should fail being able to serialize as a RecordTemplate entirely");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(sqlRow, "a_aspectbazz"));
}

@Test
public void testIsSoftDeletedAspectEbeanMetadataAspect() {
EbeanMetadataAspect ebeanMetadataAspect = new EbeanMetadataAspect();

ebeanMetadataAspect.setMetadata("{\"gma_deleted\": true}");
assertTrue(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));

ebeanMetadataAspect.setMetadata(SOFT_DELETED_ASPECT_WITH_DELETED_CONTENT);
assertTrue(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));

ebeanMetadataAspect.setMetadata("{\"gma_deleted\": false}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));

ebeanMetadataAspect.setMetadata("{\"aspect\": {\"value\": \"bar\"}, \"lastmodifiedby\": \"urn:li:tester\"}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));

ebeanMetadataAspect.setMetadata("{\"random_value\": \"baz\"}");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));

ebeanMetadataAspect.setMetadata("input that should fail being able to serialize as a RecordTemplate entirely");
assertFalse(EBeanDAOUtils.isSoftDeletedAspect(ebeanMetadataAspect));
}

@Test
Expand Down Expand Up @@ -668,4 +707,20 @@ public void testExtractRelationshipsFromAspect() throws URISyntaxException {
assertTrue(results.get(AnnotatedRelationshipFoo.class).contains(test3));
assertTrue(results.get(AnnotatedRelationshipBar.class).contains(new AnnotatedRelationshipBar()));
}

@Test
public void testCreateSoftDeletedAspect() {
// ideal case: nonnull oldvalue and oldtimestamp
AspectFoo fooAspect = new AspectFoo().setValue("foo");
Timestamp timestamp = new Timestamp(0L);
String actor = "actor";

SoftDeletedAspect softDeletedAspect =
EBeanDAOUtils.createSoftDeletedAspect(AspectFoo.class, fooAspect, timestamp, actor);
assertTrue(softDeletedAspect.isGma_deleted());
assertEquals(softDeletedAspect.getCanonicalName(), "com.linkedin.testing.AspectFoo");
assertEquals(softDeletedAspect.getDeletedContent(), RecordUtils.toJsonString(fooAspect));
assertEquals(softDeletedAspect.getDeletedTimestamp(), timestamp.toString());
assertEquals(softDeletedAspect.getDeletedBy(), actor);
}
}
Loading