Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
0e0adee
Exclude MANIFEST.MF from jackson as it conflicts with the MANIFEST.MF…
jaboehri Jun 23, 2026
daa6cdb
Initial move to DSF API v2 dependencies
jaboehri Jun 23, 2026
29581cc
ProcessPluginDeploymentStateListener is now called ProcessPluginDeplo…
jaboehri Jun 23, 2026
20f9323
No longer needs to implement InitializingBean as the API v2 version o…
jaboehri Jun 23, 2026
ca3f644
Only need to update imports
jaboehri Jun 23, 2026
4b63e32
API v2 changes:
jaboehri Jun 23, 2026
d2a74f2
Error has to be absorbed (return null) in order for the process to no…
jaboehri Jun 23, 2026
d400ffa
API v2 changes:
jaboehri Jun 23, 2026
3ce3b2d
API v2 changes:
jaboehri Jun 24, 2026
a4660ec
API v2 changes:
jaboehri Jun 24, 2026
7346901
API v2 changes:
jaboehri Jun 24, 2026
2774789
Error handling previously done in AbstractService will now be done in…
jaboehri Jun 24, 2026
0a8f352
API v2 changes:
jaboehri Jun 24, 2026
b46b290
API v2 changes:
jaboehri Jun 24, 2026
9613e9f
API v2 changes:
jaboehri Jun 24, 2026
d5bf662
API v2 changes:
jaboehri Jun 24, 2026
77d5bed
API v2 changes:
jaboehri Jun 24, 2026
3d64569
API v2 changes:
jaboehri Jun 24, 2026
a133de1
ErrorBoundaryEvent should be returned, not thrown
jaboehri Jun 24, 2026
b5784d6
API v2 changes:
jaboehri Jun 24, 2026
465f15c
API v2 changes:
jaboehri Jun 24, 2026
55aecf9
API v2 changes:
jaboehri Jun 24, 2026
c3ef65d
API v2 changes:
jaboehri Jun 25, 2026
aba0dd1
API v2 changes:
jaboehri Jun 25, 2026
ff2f404
API v2 changes:
jaboehri Jun 25, 2026
c555701
API v2 changes:
jaboehri Jun 25, 2026
f6bea5a
API v2 changes:
jaboehri Jun 25, 2026
73b2676
API v2 changes:
jaboehri Jun 25, 2026
e4be718
API v2 changes:
jaboehri Jun 25, 2026
f93a2e6
API v2 changes:
jaboehri Jun 25, 2026
cecfad7
API v2 changes:
jaboehri Jun 25, 2026
8c3cdf8
API v2 changes:
jaboehri Jun 26, 2026
4353537
API v2 changes:
jaboehri Jun 26, 2026
b5bb449
API v2 changes:
jaboehri Jun 26, 2026
d35e729
API v2 changes:
jaboehri Jun 26, 2026
890f6a2
API v2 changes:
jaboehri Jun 26, 2026
abaa492
Updated import statements
jaboehri Jun 26, 2026
71ef6dd
API v2 changes:
jaboehri Jun 26, 2026
d805c28
API v2 changes:
jaboehri Jun 26, 2026
373b8e9
API v2 changes:
jaboehri Jun 26, 2026
cb73b9c
API v2 changes:
jaboehri Jun 26, 2026
b6034ce
Starters are not needed anymore
jaboehri Jun 26, 2026
2c7e4e3
Update import statement
jaboehri Jun 26, 2026
7390ee9
No longer need custom serialization because Variables#setJsonVariable…
jaboehri Jun 30, 2026
8e4c05b
API v2 changes:
jaboehri Jun 30, 2026
de08b78
API v2 changes:
jaboehri Jun 30, 2026
5a65a15
API v2 changes:
jaboehri Jun 30, 2026
ebdd6e1
API v2 changes:
jaboehri Jun 30, 2026
8577d0e
API v2 changes:
jaboehri Jun 30, 2026
20658ec
API v2 changes:
jaboehri Jun 30, 2026
64c5076
Is now dev.dsf.bpe.v2.ProcessPluginDefinition
jaboehri Jun 30, 2026
91e0481
Format and sort
jaboehri Jun 30, 2026
985167d
API v2 changes:
jaboehri Jun 30, 2026
fff4feb
Add error message for unexpected errors occurring during the process …
jaboehri Jun 30, 2026
4c1a910
API v2 changes:
jaboehri Jun 30, 2026
7bc1ec1
Profiles should not have their versions appended and StructureDefinit…
jaboehri Jun 30, 2026
0d10da4
Needs to conform to BPMN diagram where this is used as the implementa…
jaboehri Jun 30, 2026
20af652
Remove unused imports
jaboehri Jul 2, 2026
0367850
Spring UriComponents and UriComponentsBuilder are no longer available…
jaboehri Jul 6, 2026
76b43c4
Added execution listeners that set a string version of status code va…
jaboehri Jul 6, 2026
9ff28e5
Added named id's to all tasks to make debugging easier when the BPE t…
jaboehri Jul 6, 2026
71b9701
Properly serializing records with jackson requires configuring jackso…
jaboehri Jul 6, 2026
1b62fdf
Using the wrong constructor made the task sender not use the getAddit…
jaboehri Jul 7, 2026
2d4ce30
Status code never gets set as a global variable so does not need to b…
jaboehri Jul 7, 2026
c543fda
Constructor can now deal with null values as Variables#getVariable ma…
jaboehri Jul 7, 2026
106e159
- dsf-bpe-process-api-v2-impl is not a published dependency
jaboehri Jul 7, 2026
d9a45f2
Closes #48.
jaboehri Jul 8, 2026
4d05856
API v2 changes:
jaboehri Jul 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 25
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 25
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 25
- name: Publish with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
125 changes: 79 additions & 46 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,24 @@
<packaging>jar</packaging>

<properties>
<project.build.outputTimestamp>2026-07-05T12:00:00+02:00</project.build.outputTimestamp>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compileSource>17</compileSource>
<compileTarget>17</compileTarget>
<compileSource>25</compileSource>
<compileTarget>25</compileTarget>

<dsf.version>1.9.0</dsf.version>
<spring.version>6.2.12</spring.version>
<dsf.version>2.1.0</dsf.version>
<spring.version>7.0.8</spring.version>
<dsf.location>../dsf</dsf.location>
</properties>

<name>dsf-process-ping-pong</name>
<description>DSF ping-pong process for connection tests between DSF instances</description>
<url>https://github.com/datasharingframework/dsf-process-ping-pong</url>
<organization>
<name>Data Sharing Framework</name>
<url>dsf.dev</url>
</organization>

<scm>
<connection>scm:git:git://github.com/datasharingframework/dsf-process-ping-pong.git</connection>
Expand All @@ -39,45 +45,17 @@
<dependencies>
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-process-api-v1</artifactId>
<artifactId>dsf-bpe-process-api-v2</artifactId>
<version>${dsf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.20.0</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- testing -->
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-process-api-v1</artifactId>
<version>${dsf.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-validation</artifactId>
Expand All @@ -93,6 +71,30 @@
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>plugin.properties</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>plugin.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/resources/doc</directory>
<filtering>true</filtering>
<includes>
<include>*.md</include>
</includes>
<targetPath>doc</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -108,6 +110,24 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.4</version>
</plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>copy-plugin-documentation</id>
<phase>prepare-package</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
<sourceFile>target/ConfigDoc_dev.dsf.bpe.spring.config.md</sourceFile>
<destinationFile>target/classes/doc/configuration.md</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -128,23 +148,35 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</artifact>
<includes>
<include>**</include>
</includes>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/*.MF</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/versions/9/module-info.class</exclude>
<exclude>META-INF/notice.txt</exclude>
<exclude>META-INF/spring/aot.factories</exclude>
</excludes>
</filter>
</filters>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -188,28 +220,29 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
<configuration>
<compliance>17</compliance>
<compliance>24</compliance>
<removeUnused>true</removeUnused>
<groups>java.,javax.,org.,com.</groups>
<staticGroups>java,*</staticGroups>
</configuration>
</plugin>
<plugin>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-documentation-generator</artifactId>
<artifactId>dsf-maven-plugin</artifactId>
<version>${dsf.version}</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
<goal>generate-config-doc</goal>
</goals>
</execution>
</executions>
<configuration>
<workingPackages>
<workingPackage>dev.dsf.bpe</workingPackage>
</workingPackages>
<configDocPackages>
dev.dsf.bpe.spring.config
</configDocPackages>
</configuration>
</plugin>
<plugin>
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/dev/dsf/bpe/CodeSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@ private DsfPing()
{
}

public static Coding fromCode(Code code)
public static Coding fromCode(Code code, String resourceVersion)
{
return new Coding().setSystem(URL).setCode(code.getValue())
.setVersion(PingProcessPluginDefinition.RESOURCE_VERSION);
return new Coding().setSystem(URL).setCode(code.getValue()).setVersion(resourceVersion);
}

public enum Code implements SingleStringValueEnum
Expand Down Expand Up @@ -104,10 +103,9 @@ private DsfPingStatus()
{
}

public static Coding fromCode(Code code)
public static Coding fromCode(Code code, String resourceVersion)
{
return new Coding().setSystem(URL).setCode(code.getValue())
.setVersion(PingProcessPluginDefinition.RESOURCE_VERSION);
return new Coding().setSystem(URL).setCode(code.getValue()).setVersion(resourceVersion);
}

public enum Code implements SingleStringValueEnum
Expand Down Expand Up @@ -146,10 +144,9 @@ private DsfPingUnits()
{
}

public static Coding fromCode(Code code)
public static Coding fromCode(Code code, String resourceVersion)
{
return new Coding().setSystem(URL).setCode(code.toUcum())
.setVersion(PingProcessPluginDefinition.RESOURCE_VERSION);
return new Coding().setSystem(URL).setCode(code.toUcum()).setVersion(resourceVersion);
}

public enum Code
Expand Down Expand Up @@ -359,10 +356,10 @@ private DsfPingError()
{
}

public static Coding fromConcept(Concept concept)
public static Coding fromConcept(Concept concept, String resourceVersion)
{
return new Coding().setSystem(URL).setCode(concept.getCode()).setDisplay(concept.getDisplay())
.setVersion(PingProcessPluginDefinition.RESOURCE_VERSION);
.setVersion(resourceVersion);
}

public enum Concept
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/dev/dsf/bpe/ConstantsPing.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ private ConstantsPing()
public static final String PONG_TIMEOUT_DURATION_DEFAULT_VALUE = "PT30S";

public static final String BPMN_ERROR_CODE_UNEXPECTED_ERROR = "unexpected-error";
public static final String BPMN_ERROR_MESSAGE_UNEXPECTED_ERROR = "An unexpected error has occurred";

public static final String BPMN_ERROR_CODE_TARGET_NOT_ALLOWED = "target_not_allowed";
public static final String BPMN_ERROR_MESSAGE_TARGET_NOT_ALLOWED = "target_not_allowed";

public static final String POTENTIAL_FIX_URL_BASE = "https://dsf.dev/s";
public static final String POTENTIAL_FIX_URL_ERROR_HTTP = POTENTIAL_FIX_URL_BASE + "/error-http";
Expand Down
1 change: 1 addition & 0 deletions src/main/java/dev/dsf/bpe/ExecutionVariables.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public enum ExecutionVariables
downloadResource,
downloadResourceReference,
statusCode,
statusCodeString,
error,
errorLocal,
errorRemote,
Expand Down
34 changes: 2 additions & 32 deletions src/main/java/dev/dsf/bpe/PingProcessPluginDefinition.java
Original file line number Diff line number Diff line change
@@ -1,44 +1,14 @@
package dev.dsf.bpe;

import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

import dev.dsf.bpe.spring.config.PingConfig;
import dev.dsf.bpe.v1.ProcessPluginDefinition;
import dev.dsf.bpe.v2.AbstractProcessPluginDefinition;

public class PingProcessPluginDefinition implements ProcessPluginDefinition
public class PingProcessPluginDefinition extends AbstractProcessPluginDefinition
{
public static final String RESOURCE_VERSION = "2.1";
public static final String NON_RESOURCE_VERSION = "0.0";
public static final String VERSION = RESOURCE_VERSION + "." + NON_RESOURCE_VERSION;
public static final LocalDate RELEASE_DATE = LocalDate.of(2025, 11, 25);

@Override
public String getName()
{
return "dsf-process-ping-pong";
}

@Override
public String getVersion()
{
return VERSION;
}

@Override
public String getResourceVersion()
{
return RESOURCE_VERSION;
}

@Override
public LocalDate getReleaseDate()
{
return RELEASE_DATE;
}

@Override
public List<String> getProcessModels()
{
Expand Down
Loading
Loading