Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ public static UpdateDomainRequest updateDomainRequest(com.uber.cadence.UpdateDom
fields.add(DomainUpdateVisibilityArchivalURIField);
}
}
DomainReplicationConfiguration replicationConfiguration = new DomainReplicationConfiguration();
DomainReplicationConfiguration replicationConfiguration = t.getReplicationConfiguration();
if (replicationConfiguration != null) {
if (replicationConfiguration.getActiveClusterName() != null) {
request.setActiveClusterName(replicationConfiguration.getActiveClusterName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1172,6 +1172,8 @@ public final class ProtoObjects {
.setHistoryArchivalUri("historyArchivalUri")
.setVisibilityArchivalStatus(ArchivalStatus.ARCHIVAL_STATUS_DISABLED)
.setVisibilityArchivalUri("visibilityArchivalUri")
.addAllClusters(ImmutableList.of(CLUSTER_REPLICATION_CONFIGURATION))
.setActiveClusterName("activeCluster")
.setDeleteBadBinary("deleteBadBinary")
.setFailoverTimeout(seconds(1))
.setUpdateMask(
Expand All @@ -1185,6 +1187,8 @@ public final class ProtoObjects {
.addPaths("history_archival_uri")
.addPaths("visibility_archival_status")
.addPaths("visibility_archival_uri")
.addPaths("active_cluster_name")
.addPaths("clusters")
.addPaths("delete_bad_binary")
.addPaths("failover_timeout")
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ public static Iterable<Object[]> cases() {
"emitMetric"), // Thrift has this field but proto doens't have it
testCase(
ThriftObjects.UPDATE_DOMAIN_REQUEST,
// Data and replicationConfiguration are copied incorrectly due to a bug :(
ProtoObjects.UPDATE_DOMAIN_REQUEST,
RequestMapper::updateDomainRequest),
testCase(
Expand Down
Loading