Skip to content

Commit 29dcde4

Browse files
committed
feat: v2 compat
1 parent 93193ab commit 29dcde4

25 files changed

+1140
-72
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Add the dependency to your project:
2020
</dependency>
2121
```
2222

23+
This client is compatible with the Camunda v2 API. To use it, please configure:
24+
25+
```yaml
26+
operate:
27+
client:
28+
profile: v2
29+
```
30+
2331
Configure a Camunda Operate client with simple authentication:
2432
2533
```yaml

extension/java-client-operate/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<name>Camunda Operate Client</name>
1212

1313
<dependencies>
14+
<dependency>
15+
<groupId>io.camunda</groupId>
16+
<artifactId>camunda-client-java</artifactId>
17+
</dependency>
1418
<dependency>
1519
<groupId>org.slf4j</groupId>
1620
<artifactId>slf4j-api</artifactId>

extension/java-client-operate/src/main/java/io/camunda/client/CamundaClient.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientV2.java

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

extension/java-client-operate/src/main/java/io/camunda/operate/exception/OperateException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.camunda.operate.exception;
22

3-
public class OperateException extends Exception {
3+
public class OperateException extends RuntimeException {
44

55
public OperateException() {
66
super();

extension/java-client-operate/src/main/java/io/camunda/operate/model/ChangeStatus.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,25 @@
22

33
public class ChangeStatus {
44

5-
private String message;
6-
private Long deleted;
5+
@Deprecated private String message;
6+
@Deprecated private Long deleted;
77

8+
@Deprecated
89
public String getMessage() {
910
return message;
1011
}
1112

13+
@Deprecated
1214
public void setMessage(String message) {
1315
this.message = message;
1416
}
1517

18+
@Deprecated
1619
public Long getDeleted() {
1720
return deleted;
1821
}
1922

23+
@Deprecated
2024
public void setDeleted(Long deleted) {
2125
this.deleted = deleted;
2226
}
Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
package io.camunda.operate.model;
22

3+
import java.time.OffsetDateTime;
4+
import java.time.ZoneOffset;
5+
import java.time.temporal.ChronoUnit;
6+
import java.time.temporal.TemporalUnit;
7+
import java.util.Date;
8+
39
public enum DateFilterRange {
4-
YEAR("y"),
5-
MONTH("M"),
6-
WEEK("w"),
7-
DAY("d"),
8-
HOUR("h"),
9-
MINUTE("m"),
10-
SECOND("s");
10+
YEAR("y", ChronoUnit.YEARS),
11+
MONTH("M", ChronoUnit.MONTHS),
12+
WEEK("w", ChronoUnit.WEEKS),
13+
DAY("d", ChronoUnit.DAYS),
14+
HOUR("h", ChronoUnit.HOURS),
15+
MINUTE("m", ChronoUnit.MINUTES),
16+
SECOND("s", ChronoUnit.SECONDS);
1117

1218
private final String value;
19+
private final TemporalUnit temporalUnit;
1320

14-
DateFilterRange(String value) {
21+
DateFilterRange(String value, TemporalUnit temporalUnit) {
1522
this.value = value;
23+
this.temporalUnit = temporalUnit;
1624
}
1725

1826
public static DateFilterRange from(String filterRange) {
@@ -27,4 +35,20 @@ public static DateFilterRange from(String filterRange) {
2735
public String value() {
2836
return value;
2937
}
38+
39+
public OffsetDateTime lowerBoundary(Date date) {
40+
return lowerBoundary(date.toInstant().atOffset(ZoneOffset.UTC));
41+
}
42+
43+
public OffsetDateTime higherBoundary(Date date) {
44+
return higherBoundary(date.toInstant().atOffset(ZoneOffset.UTC));
45+
}
46+
47+
public OffsetDateTime lowerBoundary(OffsetDateTime date) {
48+
return date.truncatedTo(temporalUnit);
49+
}
50+
51+
public OffsetDateTime higherBoundary(OffsetDateTime date) {
52+
return date.truncatedTo(temporalUnit).plus(1, temporalUnit);
53+
}
3054
}

extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionDefinition.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ public class DecisionDefinition {
66
private Long key;
77
private String decisionId;
88
private String name;
9-
private Long version;
9+
private Integer version;
1010
private String decisionRequirementsId;
1111
private Long decisionRequirementsKey;
12-
private String decisionRequirementsName;
13-
private Long decisionRequirementsVersion;
12+
@Deprecated private String decisionRequirementsName;
13+
@Deprecated private Long decisionRequirementsVersion;
1414
private String tenantId;
1515

1616
public String getId() {
@@ -45,11 +45,11 @@ public void setName(String name) {
4545
this.name = name;
4646
}
4747

48-
public Long getVersion() {
48+
public Integer getVersion() {
4949
return version;
5050
}
5151

52-
public void setVersion(Long version) {
52+
public void setVersion(Integer version) {
5353
this.version = version;
5454
}
5555

@@ -69,18 +69,22 @@ public void setDecisionRequirementsKey(Long decisionRequirementsKey) {
6969
this.decisionRequirementsKey = decisionRequirementsKey;
7070
}
7171

72+
@Deprecated
7273
public String getDecisionRequirementsName() {
7374
return decisionRequirementsName;
7475
}
7576

77+
@Deprecated
7678
public void setDecisionRequirementsName(String decisionRequirementsName) {
7779
this.decisionRequirementsName = decisionRequirementsName;
7880
}
7981

82+
@Deprecated
8083
public Long getDecisionRequirementsVersion() {
8184
return decisionRequirementsVersion;
8285
}
8386

87+
@Deprecated
8488
public void setDecisionRequirementsVersion(Long decisionRequirementsVersion) {
8589
this.decisionRequirementsVersion = decisionRequirementsVersion;
8690
}

extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstance.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class DecisionInstance {
1414
private String decisionId;
1515
private String decisionDefinitionId;
1616
private String decisionName;
17-
private Long decisionVersion;
17+
private Integer decisionVersion;
1818
private DecisionType decisionType;
1919
private String result;
2020
private List<DecisionInstanceInput> evaluatedInputs;
@@ -101,11 +101,11 @@ public void setDecisionName(String decisionName) {
101101
this.decisionName = decisionName;
102102
}
103103

104-
public Long getDecisionVersion() {
104+
public Integer getDecisionVersion() {
105105
return decisionVersion;
106106
}
107107

108-
public void setDecisionVersion(Long decisionVersion) {
108+
public void setDecisionVersion(Integer decisionVersion) {
109109
this.decisionVersion = decisionVersion;
110110
}
111111

extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceOutput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class DecisionInstanceOutput {
66
private String name;
77
private String value;
88
private String ruleId;
9-
private Long ruleIndex;
9+
private Integer ruleIndex;
1010

1111
public String getId() {
1212
return id;
@@ -40,11 +40,11 @@ public void setRuleId(String ruleId) {
4040
this.ruleId = ruleId;
4141
}
4242

43-
public Long getRuleIndex() {
43+
public Integer getRuleIndex() {
4444
return ruleIndex;
4545
}
4646

47-
public void setRuleIndex(Long ruleIndex) {
47+
public void setRuleIndex(Integer ruleIndex) {
4848
this.ruleIndex = ruleIndex;
4949
}
5050
}

0 commit comments

Comments
 (0)