zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 08:27:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve pretty-print diffing of Datastore entities

Browse source 
This removes the countless lines of the form "[null, []]" in registry_tool diffs
that are an artifact of the way we handle nulls in Objectify.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=133409440
This commit is contained in:
mcilwain 2016-09-16 11:43:38 -07:00 • committed by Ben McIlwain
parent 841be34d18
commit aa7c05cb8b
6 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
java/google/registry/tools/MutatingCommand.java
View file

@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.emptyToNull;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.DatastoreServiceUtils.getNameOrId;
import static google.registry.util.DiffUtils.prettyPrintDeepDiff;
import static google.registry.util.DiffUtils.prettyPrintEntityDeepDiff;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects;
@ -101,16 +101,17 @@ public abstract class MutatingCommand extends ConfirmingCommand implements Remot
/** Returns a string representation of this entity change. */
@Override
public String toString() {
String changeText;
if (type == ChangeType.UPDATE) {
String diffText = prettyPrintEntityDeepDiff(
oldEntity.toDiffableFieldMap(), newEntity.toDiffableFieldMap());
changeText = Optional.fromNullable(emptyToNull(diffText)).or("[no changes]\n");
} else {
changeText = MoreObjects.firstNonNull(oldEntity, newEntity) + "\n";
}
return String.format(
"%s %s\n%s",
UPPER_UNDERSCORE.to(UPPER_CAMEL, type.toString()),
getEntityId(),
type == ChangeType.UPDATE
? Optional
.fromNullable(emptyToNull(prettyPrintDeepDiff(
oldEntity.toDiffableFieldMap(), newEntity.toDiffableFieldMap())))
.or("[no changes]\n")
: (MoreObjects.firstNonNull(oldEntity, newEntity) + "\n"));
UPPER_UNDERSCORE.to(UPPER_CAMEL, type.toString()), getEntityId(), changeText);
}
}
@ -153,7 +154,7 @@ public abstract class MutatingCommand extends ConfirmingCommand implements Remot
checkState(
Objects.equals(change.oldEntity, existingEntity),
"Entity changed since init() was called.\n%s",
prettyPrintDeepDiff(
prettyPrintEntityDeepDiff(
change.oldEntity == null ? ImmutableMap.of()
: change.oldEntity.toDiffableFieldMap(),
existingEntity == null ? ImmutableMap.of()