Skip to content

Commit c305365

Browse files
Merge branch 'master' into feature/thrift-install-script
2 parents 20821d2 + 606808c commit c305365

19 files changed

+1662
-207
lines changed

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ googleJavaFormat {
4343
exclude '**/generated-sources/*'
4444
}
4545

46+
tasks.googleJavaFormat.dependsOn 'license'
47+
4648
group = 'com.uber.cadence'
4749
version = '3.12.5'
4850

src/main/java/com/uber/cadence/internal/compatibility/thrift/TypeMapper.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,9 @@ static DescribeDomainResponse describeDomainResponseDomain(com.uber.cadence.api.
500500
domainInfo.setOwnerEmail(t.getOwnerEmail());
501501
domainInfo.setData(t.getDataMap());
502502
domainInfo.setUuid(t.getId());
503+
503504
DomainConfiguration domainConfiguration = new DomainConfiguration();
505+
res.setConfiguration(domainConfiguration);
504506

505507
domainConfiguration.setWorkflowExecutionRetentionPeriodInDays(
506508
durationToDays(t.getWorkflowExecutionRetentionPeriod()));
@@ -511,8 +513,10 @@ static DescribeDomainResponse describeDomainResponseDomain(com.uber.cadence.api.
511513
domainConfiguration.setVisibilityArchivalStatus(
512514
archivalStatus(t.getVisibilityArchivalStatus()));
513515
domainConfiguration.setVisibilityArchivalURI(t.getVisibilityArchivalUri());
516+
514517
DomainReplicationConfiguration domainReplicationConfiguration =
515518
new DomainReplicationConfiguration();
519+
res.setReplicationConfiguration(domainReplicationConfiguration);
516520

517521
domainReplicationConfiguration.setActiveClusterName(t.getActiveClusterName());
518522
domainReplicationConfiguration.setClusters(

src/main/java/com/uber/cadence/serviceclient/IWorkflowServiceBase.java

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

src/main/java/com/uber/cadence/serviceclient/WorkflowServiceTChannel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ public RestartWorkflowExecutionResponse RestartWorkflowExecution(
524524
RestartWorkflowExecutionRequest restartRequest)
525525
throws BadRequestError, ServiceBusyError, DomainNotActiveError, LimitExceededError,
526526
EntityNotExistsError, ClientVersionNotSupportedError, TException {
527-
throw new IllegalArgumentException("unimplemented");
527+
throw new UnsupportedOperationException("unimplemented");
528528
}
529529

530530
private void deprecateDomain(DeprecateDomainRequest deprecateRequest) throws TException {
@@ -2808,7 +2808,7 @@ public void SignalWithStartWorkflowExecutionAsync(
28082808
SignalWithStartWorkflowExecutionAsyncRequest signalWithStartRequest,
28092809
AsyncMethodCallback resultHandler)
28102810
throws TException {
2811-
throw new IllegalArgumentException("unimplemented");
2811+
throw new UnsupportedOperationException("unimplemented");
28122812
}
28132813

28142814
@Override
@@ -2951,7 +2951,7 @@ public void DeprecateDomain(
29512951
public void RestartWorkflowExecution(
29522952
RestartWorkflowExecutionRequest restartRequest, AsyncMethodCallback resultHandler)
29532953
throws TException {
2954-
throw new IllegalArgumentException("unimplemented");
2954+
throw new UnsupportedOperationException("unimplemented");
29552955
}
29562956

29572957
@Override

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
/**
2+
* Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* <p>Modifications copyright (C) 2017 Uber Technologies, Inc.
5+
*
6+
* <p>Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file
7+
* except in compliance with the License. A copy of the License is located at
8+
*
9+
* <p>http://aws.amazon.com/apache2.0
10+
*
11+
* <p>or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
13+
* specific language governing permissions and limitations under the License.
14+
*/
115
package com.uber.cadence.internal.compatibility;
216

317
import static org.junit.Assert.assertEquals;

0 commit comments

Comments
 (0)