Skip to content

Commit bfe1039

Browse files
authored
fix updateDomainRequest mapper bug (#1005)
What changed? mapper correct population of fields Why? How did you test it? unit test
1 parent e38793d commit bfe1039

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/main/java/com/uber/cadence/internal/compatibility/proto/RequestMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ public static UpdateDomainRequest updateDomainRequest(com.uber.cadence.UpdateDom
800800
fields.add(DomainUpdateVisibilityArchivalURIField);
801801
}
802802
}
803-
DomainReplicationConfiguration replicationConfiguration = new DomainReplicationConfiguration();
803+
DomainReplicationConfiguration replicationConfiguration = t.getReplicationConfiguration();
804804
if (replicationConfiguration != null) {
805805
if (replicationConfiguration.getActiveClusterName() != null) {
806806
request.setActiveClusterName(replicationConfiguration.getActiveClusterName());

src/test/java/com/uber/cadence/internal/compatibility/ProtoObjects.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,6 +1172,8 @@ public final class ProtoObjects {
11721172
.setHistoryArchivalUri("historyArchivalUri")
11731173
.setVisibilityArchivalStatus(ArchivalStatus.ARCHIVAL_STATUS_DISABLED)
11741174
.setVisibilityArchivalUri("visibilityArchivalUri")
1175+
.addAllClusters(ImmutableList.of(CLUSTER_REPLICATION_CONFIGURATION))
1176+
.setActiveClusterName("activeCluster")
11751177
.setDeleteBadBinary("deleteBadBinary")
11761178
.setFailoverTimeout(seconds(1))
11771179
.setUpdateMask(
@@ -1185,6 +1187,8 @@ public final class ProtoObjects {
11851187
.addPaths("history_archival_uri")
11861188
.addPaths("visibility_archival_status")
11871189
.addPaths("visibility_archival_uri")
1190+
.addPaths("active_cluster_name")
1191+
.addPaths("clusters")
11881192
.addPaths("delete_bad_binary")
11891193
.addPaths("failover_timeout")
11901194
.build())

src/test/java/com/uber/cadence/internal/compatibility/proto/RequestMapperTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public static Iterable<Object[]> cases() {
236236
"emitMetric"), // Thrift has this field but proto doens't have it
237237
testCase(
238238
ThriftObjects.UPDATE_DOMAIN_REQUEST,
239-
// Data and replicationConfiguration are copied incorrectly due to a bug :(
240239
ProtoObjects.UPDATE_DOMAIN_REQUEST,
241240
RequestMapper::updateDomainRequest),
242241
testCase(

0 commit comments

Comments
 (0)