Skip to content

Commit b97a600

Browse files
siri-varmasiri-varma
committed
Rename classes
1 parent 6cd3bca commit b97a600

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎sdk/src/main/java/io/dapr/client/DaprClientImpl.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import io.dapr.client.domain.DeleteStateRequest;
3737
import io.dapr.client.domain.ExecuteStateTransactionRequest;
3838
import io.dapr.client.domain.FailurePolicy;
39-
import io.dapr.client.domain.FailurePolicyKind;
39+
import io.dapr.client.domain.FailurePolicyType;
4040
import io.dapr.client.domain.GetBulkSecretRequest;
4141
import io.dapr.client.domain.GetBulkStateRequest;
4242
import io.dapr.client.domain.GetConfigurationRequest;
@@ -48,8 +48,8 @@
4848
import io.dapr.client.domain.HttpExtension;
4949
import io.dapr.client.domain.InvokeBindingRequest;
5050
import io.dapr.client.domain.InvokeMethodRequest;
51-
import io.dapr.client.domain.JobFailurePolicyConstant;
52-
import io.dapr.client.domain.JobFailurePolicyDrop;
51+
import io.dapr.client.domain.ConstantFailurePolicy;
52+
import io.dapr.client.domain.DropFailurePolicy;
5353
import io.dapr.client.domain.JobSchedule;
5454
import io.dapr.client.domain.LockRequest;
5555
import io.dapr.client.domain.PublishEventRequest;
@@ -1345,14 +1345,14 @@ public Mono<Void> scheduleJob(ScheduleJobRequest scheduleJobRequest) {
13451345
CommonProtos.JobFailurePolicy.Builder jobFailurePolicyBuilder = CommonProtos.JobFailurePolicy.newBuilder();
13461346

13471347
FailurePolicy failurePolicy = scheduleJobRequest.getFailurePolicy();
1348-
if (failurePolicy.getFailurePolicyKind() == FailurePolicyKind.DROP) {
1348+
if (failurePolicy.getFailurePolicyKind() == FailurePolicyType.DROP) {
13491349

13501350
jobFailurePolicyBuilder.setDrop(CommonProtos.JobFailurePolicyDrop.newBuilder().build());
13511351
} else {
13521352

13531353
CommonProtos.JobFailurePolicyConstant.Builder constantPolicyBuilder =
13541354
CommonProtos.JobFailurePolicyConstant.newBuilder();
1355-
JobFailurePolicyConstant jobConstantFailurePolicy = (JobFailurePolicyConstant)failurePolicy;
1355+
ConstantFailurePolicy jobConstantFailurePolicy = (ConstantFailurePolicy)failurePolicy;
13561356
if (jobConstantFailurePolicy.getMaxRetries() != null) {
13571357
constantPolicyBuilder.setMaxRetries(jobConstantFailurePolicy.getMaxRetries());
13581358
}
@@ -1413,19 +1413,19 @@ public Mono<GetJobResponse> getJob(GetJobRequest getJobRequest) {
14131413
CommonProtos.JobFailurePolicy jobFailurePolicy = job.getFailurePolicy();
14141414

14151415
if (jobFailurePolicy.hasDrop()) {
1416-
getJobResponse.setFailurePolicy(new JobFailurePolicyDrop());
1416+
getJobResponse.setFailurePolicy(new DropFailurePolicy());
14171417
}
14181418
if (jobFailurePolicy.hasConstant()) {
14191419
CommonProtos.JobFailurePolicyConstant jobFailurePolicyConstant = jobFailurePolicy.getConstant();
14201420
if (jobFailurePolicyConstant.hasInterval() && jobFailurePolicyConstant.hasMaxRetries()) {
14211421
getJobResponse.setFailurePolicy(
1422-
new JobFailurePolicyConstant(jobFailurePolicyConstant.getMaxRetries())
1422+
new ConstantFailurePolicy(jobFailurePolicyConstant.getMaxRetries())
14231423
.setDurationBetweenRetries(Duration.of(jobFailurePolicyConstant.getInterval().getNanos(),
14241424
ChronoUnit.NANOS)));
14251425
} else if (jobFailurePolicyConstant.hasMaxRetries()) {
1426-
getJobResponse.setFailurePolicy(new JobFailurePolicyConstant(jobFailurePolicyConstant.getMaxRetries()));
1426+
getJobResponse.setFailurePolicy(new ConstantFailurePolicy(jobFailurePolicyConstant.getMaxRetries()));
14271427
} else {
1428-
getJobResponse.setFailurePolicy(new JobFailurePolicyConstant(
1428+
getJobResponse.setFailurePolicy(new ConstantFailurePolicy(
14291429
Duration.of(jobFailurePolicyConstant.getInterval().getNanos(),
14301430
ChronoUnit.NANOS)));
14311431
}

‎sdk/src/main/java/io/dapr/client/domain/JobFailurePolicyConstant.java renamed to ‎sdk/src/main/java/io/dapr/client/domain/ConstantFailurePolicy.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* This implementation of {@link FailurePolicy} retries a job a fixed number of times
2121
* with a constant delay between each retry attempt.
2222
*/
23-
public class JobFailurePolicyConstant implements FailurePolicy {
23+
public class ConstantFailurePolicy implements FailurePolicy {
2424

2525
private Integer maxRetries;
2626
private Duration durationBetweenRetries;
@@ -30,7 +30,7 @@ public class JobFailurePolicyConstant implements FailurePolicy {
3030
*
3131
* @param maxRetries the maximum number of retries
3232
*/
33-
public JobFailurePolicyConstant(Integer maxRetries) {
33+
public ConstantFailurePolicy(Integer maxRetries) {
3434
this.maxRetries = maxRetries;
3535
}
3636

@@ -39,7 +39,7 @@ public JobFailurePolicyConstant(Integer maxRetries) {
3939
*
4040
* @param durationBetweenRetries the duration to wait between retries
4141
*/
42-
public JobFailurePolicyConstant(Duration durationBetweenRetries) {
42+
public ConstantFailurePolicy(Duration durationBetweenRetries) {
4343
this.durationBetweenRetries = durationBetweenRetries;
4444
}
4545

@@ -49,7 +49,7 @@ public JobFailurePolicyConstant(Duration durationBetweenRetries) {
4949
* @param durationBetweenRetries the duration between retries
5050
* @return a {@code JobFailurePolicyConstant}.
5151
*/
52-
public JobFailurePolicyConstant setDurationBetweenRetries(Duration durationBetweenRetries) {
52+
public ConstantFailurePolicy setDurationBetweenRetries(Duration durationBetweenRetries) {
5353
this.durationBetweenRetries = durationBetweenRetries;
5454
return this;
5555
}
@@ -60,7 +60,7 @@ public JobFailurePolicyConstant setDurationBetweenRetries(Duration durationBetwe
6060
* @param maxRetries the number of retries
6161
* @return a {@code JobFailurePolicyConstant}.
6262
*/
63-
public JobFailurePolicyConstant setMaxRetries(int maxRetries) {
63+
public ConstantFailurePolicy setMaxRetries(int maxRetries) {
6464
this.maxRetries = maxRetries;
6565
return this;
6666
}
@@ -86,10 +86,10 @@ public Integer getMaxRetries() {
8686
/**
8787
* Returns the type of failure policy.
8888
*
89-
* @return {@link FailurePolicyKind#CONSTANT}
89+
* @return {@link FailurePolicyType#CONSTANT}
9090
*/
9191
@Override
92-
public FailurePolicyKind getFailurePolicyKind() {
93-
return FailurePolicyKind.CONSTANT;
92+
public FailurePolicyType getFailurePolicyKind() {
93+
return FailurePolicyType.CONSTANT;
9494
}
9595
}

‎sdk/src/main/java/io/dapr/client/domain/JobFailurePolicyDrop.java renamed to ‎sdk/src/main/java/io/dapr/client/domain/DropFailurePolicy.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
* This implementation of {@link FailurePolicy} immediately discards failed jobs
1919
* instead of retrying them.
2020
*/
21-
public class JobFailurePolicyDrop implements FailurePolicy {
21+
public class DropFailurePolicy implements FailurePolicy {
2222

2323
/**
2424
* Returns the type of failure policy.
2525
*
26-
* @return {@link FailurePolicyKind#DROP}
26+
* @return {@link FailurePolicyType#DROP}
2727
*/
2828
@Override
29-
public FailurePolicyKind getFailurePolicyKind() {
30-
return FailurePolicyKind.DROP;
29+
public FailurePolicyType getFailurePolicyKind() {
30+
return FailurePolicyType.DROP;
3131
}
3232
}

‎sdk/src/main/java/io/dapr/client/domain/FailurePolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
* Set a failure policy for the job.
1818
*/
1919
public interface FailurePolicy {
20-
FailurePolicyKind getFailurePolicyKind();
20+
FailurePolicyType getFailurePolicyKind();
2121
}

‎sdk/src/main/java/io/dapr/client/domain/FailurePolicyKind.java renamed to ‎sdk/src/main/java/io/dapr/client/domain/FailurePolicyType.java

File renamed without changes.

‎sdk/src/test/java/io/dapr/client/DaprPreviewClientGrpcTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import io.dapr.client.domain.DeleteJobRequest;
2626
import io.dapr.client.domain.GetJobRequest;
2727
import io.dapr.client.domain.GetJobResponse;
28-
import io.dapr.client.domain.JobFailurePolicyConstant;
29-
import io.dapr.client.domain.JobFailurePolicyDrop;
28+
import io.dapr.client.domain.ConstantFailurePolicy;
29+
import io.dapr.client.domain.DropFailurePolicy;
3030
import io.dapr.client.domain.JobSchedule;
3131
import io.dapr.client.domain.ConversationInput;
3232
import io.dapr.client.domain.ConversationRequest;
@@ -831,7 +831,7 @@ public void scheduleJobShouldHavePolicyWhenPolicyIsSet() {
831831

832832
ScheduleJobRequest expectedScheduleJobRequest = new ScheduleJobRequest("testJob",
833833
JobSchedule.fromString("* * * * * *"))
834-
.setFailurePolicy(new JobFailurePolicyDrop());
834+
.setFailurePolicy(new DropFailurePolicy());
835835

836836
previewClient.scheduleJob(expectedScheduleJobRequest).block();
837837

@@ -859,7 +859,7 @@ public void scheduleJobShouldHaveConstantPolicyWithMaxRetriesWhenConstantPolicyI
859859

860860
ScheduleJobRequest expectedScheduleJobRequest = new ScheduleJobRequest("testJob",
861861
JobSchedule.fromString("* * * * * *"))
862-
.setFailurePolicy(new JobFailurePolicyConstant(2));
862+
.setFailurePolicy(new ConstantFailurePolicy(2));
863863

864864
previewClient.scheduleJob(expectedScheduleJobRequest).block();
865865

@@ -888,7 +888,7 @@ public void scheduleJobShouldHaveConstantPolicyWithIntervalWhenConstantPolicyIsS
888888

889889
ScheduleJobRequest expectedScheduleJobRequest = new ScheduleJobRequest("testJob",
890890
JobSchedule.fromString("* * * * * *"))
891-
.setFailurePolicy(new JobFailurePolicyConstant(Duration.of(2, ChronoUnit.SECONDS)));
891+
.setFailurePolicy(new ConstantFailurePolicy(Duration.of(2, ChronoUnit.SECONDS)));
892892

893893
previewClient.scheduleJob(expectedScheduleJobRequest).block();
894894

@@ -918,7 +918,7 @@ public void scheduleJobShouldHaveBothRetiresAndIntervalWhenConstantPolicyIsSetWi
918918

919919
ScheduleJobRequest expectedScheduleJobRequest = new ScheduleJobRequest("testJob",
920920
JobSchedule.fromString("* * * * * *"))
921-
.setFailurePolicy(new JobFailurePolicyConstant(Duration.of(2, ChronoUnit.SECONDS))
921+
.setFailurePolicy(new ConstantFailurePolicy(Duration.of(2, ChronoUnit.SECONDS))
922922
.setMaxRetries(10));
923923

924924
previewClient.scheduleJob(expectedScheduleJobRequest).block();

0 commit comments

Comments
 (0)