Skip to content

Commit 413fe1a

Browse files
zambrovskizambrovski
committed
Merge branch 'release/1.2'
2 parents b53cc58 + c053c74 commit 413fe1a

File tree

16 files changed

+154
-24
lines changed

16 files changed

+154
-24
lines changed

‎.github/workflows/development.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Development branches
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches:
@@ -44,7 +47,7 @@ jobs:
4447
distribution: 'zulu'
4548
cache: maven
4649

47-
- name: Determine if Tests Should Be Skipped
50+
- name: Determine if tests should be skipped
4851
id: check_skip_tests
4952
run: |
5053
if [[ "${{ github.ref }}" == "refs/heads/skip-tests" ]]; then
@@ -72,6 +75,6 @@ jobs:
7275
7376
- name: Upload coverage to Codecov
7477
if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
75-
uses: codecov/codecov-action@v5.4.2
78+
uses: codecov/codecov-action@v5.4.3
7679
with:
7780
token: ${{secrets.CODECOV_TOKEN}}

‎.github/workflows/master.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Produces and releases artifacts
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches:
@@ -41,12 +44,13 @@ jobs:
4144

4245
# Publish release
4346
- name: Deploy a new release version to Maven Central
44-
run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}"
47+
run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}"
4548
env:
4649
OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
4750
OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
51+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4852

4953
- name: Upload coverage information
50-
uses: codecov/codecov-action@v5.4.2
54+
uses: codecov/codecov-action@v5.4.3
5155
with:
5256
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/release-notes.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
# Trigger the workflow on milestone events
1+
name: Milestone Closure
2+
3+
permissions:
4+
contents: read
5+
26
on:
37
milestone:
48
types: [closed]
5-
name: Milestone Closure
9+
610
jobs:
711
create-release-notes:
812
runs-on: ubuntu-latest

‎api-impl/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>dev.bpm-crafters.process-engine-api</groupId>
77
<artifactId>process-engine-api-root</artifactId>
8-
<version>1.1</version>
8+
<version>1.2</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>dev.bpm-crafters.process-engine-api</groupId>
66
<artifactId>process-engine-api-root</artifactId>
7-
<version>1.1</version>
7+
<version>1.2</version>
88
</parent>
99

1010
<artifactId>process-engine-api</artifactId>

‎api/src/main/kotlin/dev/bpmcrafters/processengineapi/correlation/CorrelateMessageCmd.kt‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,57 @@
11
package dev.bpmcrafters.processengineapi.correlation
22

3+
import dev.bpmcrafters.processengineapi.CommonRestrictions
34
import dev.bpmcrafters.processengineapi.PayloadSupplier
45

56
/**
67
* Command to correlate a message with running process instance.
78
* @since 0.0.1
89
*/
910
data class CorrelateMessageCmd(
11+
/**
12+
* The message name as defined in the BPMN process.
13+
*/
1014
val messageName: String,
15+
/**
16+
* Payload supplier.
17+
*/
1118
val payloadSupplier: PayloadSupplier,
12-
val correlation: CorrelationSupplier
19+
/**
20+
* Correlation supplier.
21+
*/
22+
val correlation: CorrelationSupplier,
23+
/**
24+
* Restrictions applied for this message.
25+
*/
26+
val restrictions: Map<String, String> = emptyMap()
1327
) : PayloadSupplier by payloadSupplier {
28+
/**
29+
* Constructs a correlation command by message name, payload and correlation.
30+
* @param messageName message name.
31+
* @param payload payload to use.
32+
* @param correlation correlation to use.
33+
*/
34+
constructor(messageName: String, payload: Map<String, Any>, correlation: Correlation, restrictions: Map<String, String>) :
35+
this(
36+
messageName = messageName,
37+
payloadSupplier = PayloadSupplier { payload },
38+
correlation = CorrelationSupplier { correlation},
39+
restrictions = restrictions
40+
)
41+
1442
/**
1543
* Constructs a correlation command by message name, payload and correlation.
1644
* @param messageName message name.
1745
* @param payload payload to use.
1846
* @param correlation correlation to use.
1947
*/
2048
constructor(messageName: String, payload: Map<String, Any>, correlation: Correlation) :
21-
this(messageName = messageName, payloadSupplier = PayloadSupplier { payload }, correlation = CorrelationSupplier { correlation} )
49+
this(
50+
messageName = messageName,
51+
payloadSupplier = PayloadSupplier { payload },
52+
correlation = CorrelationSupplier { correlation},
53+
restrictions = mapOf()
54+
)
2255
/**
2356
* Constructs a correlation command by message name, no payload and correlation.
2457
* @param messageName message name.

‎api/src/main/kotlin/dev/bpmcrafters/processengineapi/correlation/SendSignalCmd.kt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,18 @@ import dev.bpmcrafters.processengineapi.PayloadSupplier
77
* @since 0.0.1
88
*/
99
data class SendSignalCmd(
10+
/**
11+
* Signal name.
12+
*/
1013
val signalName: String,
14+
/**
15+
* Payload supplier.
16+
*/
1117
val payloadSupplier: PayloadSupplier,
12-
val restrictions: Map<String, String>
18+
/**
19+
* Restrictions of the signaling.
20+
*/
21+
val restrictions: Map<String, String> = emptyMap()
1322
) : PayloadSupplier by payloadSupplier {
1423
/**
1524
* Constructs a signal command by signal name, restrictions and given payload.

‎api/src/main/kotlin/dev/bpmcrafters/processengineapi/process/StartProcessApi.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package dev.bpmcrafters.processengineapi.process
22

33
import dev.bpmcrafters.processengineapi.MetaInfoAware
4+
import dev.bpmcrafters.processengineapi.RestrictionAware
45
import java.util.concurrent.Future
56

67
/**
78
* API to start new process instances.
89
* @since 0.0.1
910
*/
10-
interface StartProcessApi : MetaInfoAware {
11+
interface StartProcessApi : MetaInfoAware, RestrictionAware {
1112
/**
1213
* Starts a new process instance.
1314
* @param cmd command describing the start.

‎api/src/main/kotlin/dev/bpmcrafters/processengineapi/process/StartProcessByDefinitionCmd.kt‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,34 @@ data class StartProcessByDefinitionCmd(
1414
/**
1515
* Payload supplier to pass to the new process instance.
1616
*/
17-
val payloadSupplier: PayloadSupplier
17+
val payloadSupplier: PayloadSupplier,
18+
/**
19+
* Restrictions applied for this message.
20+
*/
21+
val restrictions: Map<String, String> = emptyMap()
1822
) : StartProcessCommand, PayloadSupplier by payloadSupplier {
23+
/**
24+
* Constructs a start command with definition key and payload.
25+
* @param definitionKey process definition key.
26+
* @param payload payload to use.
27+
* @param restrictions restrictions for the message.
28+
*/
29+
constructor(definitionKey: String, payload: Map<String, Any>, restrictions: Map<String, String>) : this(
30+
definitionKey = definitionKey,
31+
payloadSupplier = PayloadSupplier { payload },
32+
restrictions = restrictions
33+
)
1934
/**
2035
* Constructs a start command with definition key and payload.
2136
* @param definitionKey process definition key.
2237
* @param payload payload to use.
2338
*/
24-
constructor(definitionKey: String, payload: Map<String, Any>) : this(definitionKey, PayloadSupplier { payload } )
39+
constructor(definitionKey: String, payload: Map<String, Any>) : this(
40+
definitionKey = definitionKey,
41+
payloadSupplier = PayloadSupplier { payload } ,
42+
restrictions = mapOf()
43+
)
44+
2545
/**
2646
* Constructs a start command with definition key and no payload.
2747
* @param definitionKey process definition key.

‎api/src/main/kotlin/dev/bpmcrafters/processengineapi/process/StartProcessByMessageCmd.kt‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,33 @@ data class StartProcessByMessageCmd(
1414
/**
1515
* Payload supplier.
1616
*/
17-
val payloadSupplier: PayloadSupplier
17+
val payloadSupplier: PayloadSupplier,
18+
/**
19+
* Restrictions applied for this message.
20+
*/
21+
val restrictions: Map<String, String> = emptyMap()
1822
) : StartProcessCommand, PayloadSupplier by payloadSupplier {
23+
/**
24+
* Constructs a start command by message name and payload.
25+
* @param messageName message name.
26+
* @param payload payload to use.
27+
* @param restrictions restrictions for the message.
28+
*/
29+
constructor(messageName: String, payload: Map<String, Any>, restrictions: Map<String, String>) : this(
30+
messageName = messageName,
31+
payloadSupplier = PayloadSupplier { payload },
32+
restrictions = restrictions
33+
)
1934
/**
2035
* Constructs a start command by message name and payload.
2136
* @param messageName message name.
2237
* @param payload payload to use.
2338
*/
24-
constructor(messageName: String, payload: Map<String, Any>) : this(messageName, PayloadSupplier { payload } )
39+
constructor(messageName: String, payload: Map<String, Any>) : this(
40+
messageName = messageName,
41+
payloadSupplier = PayloadSupplier { payload },
42+
restrictions = mapOf()
43+
)
2544
/**
2645
* Constructs a start command by message and no payload.
2746
* @param messageName message name.

0 commit comments

Comments
 (0)