diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index e198667..eae7d5b 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -21,7 +21,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_SEC }} gpg-passphrase: MAVEN_CENTRAL_GPG_PASSPHRASE - name: Deploy SNAPSHOT / Release - uses: camunda-community-hub/community-action-maven-release@v2 + uses: cibseven-community-hub/community-action-maven-release@v0.0.1 with: release-version: ${{ github.event.release.tag_name }} nexus-usr: ${{ secrets.NEXUS_USR }} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/README.md b/README.md index f9a996e..322706e 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# Camunda Engine OpenAPI REST Client Java and Spring Boot +# CIB seven Engine OpenAPI REST Client Java and Spring Boot -[![](https://img.shields.io/badge/Community%20Extension-An%20open%20source%20community%20maintained%20project-FF4700)](https://github.com/camunda-community-hub/community) [![](https://img.shields.io/badge/Lifecycle-Incubating-blue)](https://github.com/Camunda-Community-Hub/community/blob/main/extension-lifecycle.md#incubating-) ![Compatible with: Camunda Platform 7](https://img.shields.io/badge/Compatible%20with-Camunda%20Platform%207-26d07c) +[![](https://img.shields.io/badge/Community%20Extension-An%20open%20source%20community%20maintained%20project-FF4700)](https://github.com/cibseven-community-hub/community) [![](https://img.shields.io/badge/Lifecycle-Incubating-blue)](https://github.com/CIBseven-Community-Hub/community/blob/main/extension-lifecycle.md#incubating-) ![Compatible with: CIB seven Platform 7](https://img.shields.io/badge/Compatible%20with-CIB%20seven%20Platform%207-26d07c) -This community extension is a convenience wrapper around the generated Java client from the Camunda Platform 7.x OpenAPI spec. +This community extension is a convenience wrapper around the generated Java client from the CIB seven Platform 7.x OpenAPI spec. ## Example application -An example application using this community extension in a Spring Boot context can be found here: https://github.com/berndruecker/camunda-platform-remote-spring-boot-example +An example application using this community extension in a Spring Boot context can be found here: https://github.com/berndruecker/cibseven-platform-remote-spring-boot-example ## Using the client -The camunda endpoint in the `ApiClient` is by default `http://localhost:8080/engine-rest`, if you use a diffrent path then set it through *`setBasePath`* method of the `ApiClient`. +The CIB seven endpoint in the `ApiClient` is by default `http://localhost:8080/engine-rest`, if you use a different path then set it through *`setBasePath`* method of the `ApiClient`. ### Plain Java @@ -18,8 +18,8 @@ In a plain Java project you can simply add this dependency (**please make sure t ``` - org.camunda.community - camunda-engine-rest-client-openapi-java + org.cibseven.community + cibseven-engine-rest-client-openapi-java 7.23.0 ``` @@ -62,16 +62,17 @@ Add this dependency: ``` - org.camunda.community - camunda-engine-rest-client-openapi-springboot + org.cibseven.community + cibseven-engine-rest-client-openapi-springboot 7.20.0 ``` -You can configure the Camunda *endpoint* via your `application.properties` and initialize the client been like this: +You can configure the CIB seven *endpoint* via your `application.properties` and initialize the client like this: ``` -camunda.bpm.client.base-url: http://localhost:8080/engine-rest +cibseven.bpm.client.base-url: http://localhost:8080/engine-rest + ``` And then simply inject the API, for example: @@ -99,30 +100,31 @@ public class ExampleRestEndpoint { You can auto-deploy resources from your project, like BPMN processes. As default, all `.bpmn`, `.dmn`, and `.form` files are picked up and deployed. The pattern for resource files can be configured: ``` -camunda.autoDeploy.bpmnResources: 'classpath*:**/*.bpmn' -camunda.autoDeploy.dmnResources: 'classpath*:**/*.dmn' -camunda.autoDeploy.formResources: 'classpath*:**/*.form' +##### Auto-deployment configuration +cibseven.autoDeploy.bpmnResources: 'classpath*:**/*.bpmn' +cibseven.autoDeploy.dmnResources: 'classpath*:**/*.dmn' +cibseven.autoDeploy.formResources: 'classpath*:**/*.form' ``` You can disable auto deployment (which is enabled by default): ``` -camunda.autoDeploy.enabled: false +cibseven.autoDeploy.enabled: false ``` If you want to disable service start failure if it fails during deployment of the resource (which is enabled by default): ``` -camunda.autoDeploy.failStartupOnError: false +cibseven.autoDeploy.failStartupOnError: false ``` ### Spring Boot OpenAPI + External Task Bundle -Most often you might also want to use the OpenAPI, but also leverage the [Camunda External Task Client as Spring Boot Starter](https://github.com/camunda/camunda-bpm-platform/tree/master/spring-boot-starter/starter-client). To do so you can simply add this convenience library which bundles both: +Most often you might also want to use the OpenAPI, but also leverage the [CIB seven External Task Client as Spring Boot Starter](https://github.com/cibseven/cibseven-bpm-platform/tree/master/spring-boot-starter/starter-client). To do so you can simply add this convenience library which bundles both: ``` - org.camunda.community - camunda-engine-rest-client-complete-springboot-starter + org.cibseven.community + cibseven-engine-rest-client-complete-springboot-starter 7.20.0 ``` diff --git a/camunda-engine-rest-client-complete-springboot-starter/pom.xml b/camunda-engine-rest-client-complete-springboot-starter/pom.xml deleted file mode 100644 index 7c227b6..0000000 --- a/camunda-engine-rest-client-complete-springboot-starter/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.camunda.community - camunda-engine-rest-client-root - 7.23.0-SNAPSHOT - - - camunda-engine-rest-client-complete-springboot-starter - Camunda Engine REST Client Complete Spring Boot Starter - - - - org.camunda.community - camunda-engine-rest-client-openapi-springboot - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-external-task-client - - - diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/camunda-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 2c39e49..0000000 --- a/camunda-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,4 +0,0 @@ -org.camunda.community.rest.client.springboot.CamundaOpenApiStarter -org.camunda.community.rest.client.springboot.CamundaApi -org.camunda.community.rest.client.springboot.CamundaHistoryApi -org.camunda.community.rest.client.springboot.CamundaProcessAutodeployment diff --git a/cibseven-engine-rest-client-complete-springboot-starter/pom.xml b/cibseven-engine-rest-client-complete-springboot-starter/pom.xml new file mode 100644 index 0000000..5d57ec3 --- /dev/null +++ b/cibseven-engine-rest-client-complete-springboot-starter/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + + org.cibseven.community + cibseven-engine-rest-client-root + 2.1.0-SNAPSHOT + + + cibseven-engine-rest-client-complete-springboot-starter + CIB seven Engine REST Client Complete Spring Boot Starter + + + + org.cibseven.community + cibseven-engine-rest-client-openapi-springboot + + + + org.cibseven.bpm.springboot + cibseven-bpm-spring-boot-starter-external-task-client + + + diff --git a/camunda-engine-rest-client-openapi-java/pom.xml b/cibseven-engine-rest-client-openapi-java/pom.xml similarity index 78% rename from camunda-engine-rest-client-openapi-java/pom.xml rename to cibseven-engine-rest-client-openapi-java/pom.xml index 3ac15e9..ba742a3 100644 --- a/camunda-engine-rest-client-openapi-java/pom.xml +++ b/cibseven-engine-rest-client-openapi-java/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.camunda.community - camunda-engine-rest-client-root - 7.23.0-SNAPSHOT + org.cibseven.community + cibseven-engine-rest-client-root + 2.1.0-SNAPSHOT - camunda-engine-rest-client-openapi-java - Camunda Engine REST Client OpenApi Java + cibseven-engine-rest-client-openapi-java + CIB seven Engine REST Client OpenApi Java @@ -69,9 +69,9 @@ openapi-generator-maven-plugin - org.camunda.bpm - camunda-engine-rest-openapi - ${camunda.version} + org.cibseven.bpm + cibseven-engine-rest-openapi + ${cibseven.version} @@ -83,10 +83,10 @@ /openapi.json java - org.camunda.community.rest.client - org.camunda.community.rest.client.api - org.camunda.community.rest.client.invoker - org.camunda.community.rest.client.dto + org.cibseven.community.rest.client + org.cibseven.community.rest.client.api + org.cibseven.community.rest.client.invoker + org.cibseven.community.rest.client.dto apache-httpclient java8 ${project.build.directory}/generated-test-sources/openapi diff --git a/camunda-engine-rest-client-openapi-springboot/pom.xml b/cibseven-engine-rest-client-openapi-springboot/pom.xml similarity index 66% rename from camunda-engine-rest-client-openapi-springboot/pom.xml rename to cibseven-engine-rest-client-openapi-springboot/pom.xml index 69d024a..b614262 100644 --- a/camunda-engine-rest-client-openapi-springboot/pom.xml +++ b/cibseven-engine-rest-client-openapi-springboot/pom.xml @@ -3,18 +3,18 @@ 4.0.0 - org.camunda.community - camunda-engine-rest-client-root - 7.23.0-SNAPSHOT + org.cibseven.community + cibseven-engine-rest-client-root + 2.1.0-SNAPSHOT - camunda-engine-rest-client-openapi-springboot + cibseven-engine-rest-client-openapi-springboot - Camunda Engein REST Client OpenApi Spring Boot + CIB seven Engine REST Client OpenApi Spring Boot - org.camunda.community - camunda-engine-rest-client-openapi-java + org.cibseven.community + cibseven-engine-rest-client-openapi-java org.springframework.boot diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaApi.java b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenApi.java similarity index 94% rename from camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaApi.java rename to cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenApi.java index bc55120..0b49aa1 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaApi.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenApi.java @@ -1,16 +1,16 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; -import org.camunda.community.rest.client.api.*; -import org.camunda.community.rest.client.invoker.ApiClient; +import org.cibseven.community.rest.client.api.*; +import org.cibseven.community.rest.client.invoker.ApiClient; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class CamundaApi { +public class CibSevenApi { private final ApiClient apiClient; - public CamundaApi(ApiClient apiClient) { + public CibSevenApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaAutodeploymentProperties.java b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenAutodeploymentProperties.java similarity index 88% rename from camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaAutodeploymentProperties.java rename to cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenAutodeploymentProperties.java index 3712021..df8f5d6 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaAutodeploymentProperties.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenAutodeploymentProperties.java @@ -1,9 +1,9 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties("camunda.auto-deploy") -public class CamundaAutodeploymentProperties { +@ConfigurationProperties("cibseven.auto-deploy") +public class CibSevenAutodeploymentProperties { private String bpmnResources = "classpath*:**/*.bpmn"; private String dmnResources = "classpath*:**/*.dmn"; private String formResources = "classpath*:**/*.form"; diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaHistoryApi.java b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenHistoryApi.java similarity index 89% rename from camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaHistoryApi.java rename to cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenHistoryApi.java index 27799d1..ec8c7ed 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaHistoryApi.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenHistoryApi.java @@ -1,16 +1,16 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; -import org.camunda.community.rest.client.api.*; -import org.camunda.community.rest.client.invoker.ApiClient; +import org.cibseven.community.rest.client.api.*; +import org.cibseven.community.rest.client.invoker.ApiClient; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class CamundaHistoryApi { +public class CibSevenHistoryApi { private final ApiClient apiClient; - public CamundaHistoryApi(ApiClient apiClient) { + public CibSevenHistoryApi(ApiClient apiClient) { this.apiClient = apiClient; } diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarter.java b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarter.java similarity index 67% rename from camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarter.java rename to cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarter.java index 2f00e70..aadcf5a 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarter.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarter.java @@ -1,21 +1,21 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; -import org.camunda.community.rest.client.invoker.ApiClient; +import org.cibseven.community.rest.client.invoker.ApiClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class CamundaOpenApiStarter { +public class CibSevenOpenApiStarter { private final String basePath; private final String username; private final String password; - public CamundaOpenApiStarter( - @Value("${camunda.bpm.client.base-url:#{null}}") String basePath, - @Value("${camunda.bpm.client.basic-auth.username:#{null}}") String username, - @Value("${camunda.bpm.client.basic-auth.password:#{null}}") String password) { + public CibSevenOpenApiStarter( + @Value("${cibseven.bpm.client.base-url:#{null}}") String basePath, + @Value("${cibseven.bpm.client.basic-auth.username:#{null}}") String username, + @Value("${cibseven.bpm.client.basic-auth.password:#{null}}") String password) { this.basePath = basePath; this.username = username; this.password = password; diff --git a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaProcessAutodeployment.java b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenProcessAutodeployment.java similarity index 72% rename from camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaProcessAutodeployment.java rename to cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenProcessAutodeployment.java index e4df2cf..1d2bfb3 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaProcessAutodeployment.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/java/org/cibseven/community/rest/client/springboot/CibSevenProcessAutodeployment.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import java.io.File; import java.io.FileOutputStream; @@ -7,8 +7,8 @@ import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.camunda.community.rest.client.api.DeploymentApi; -import org.camunda.community.rest.client.invoker.ApiException; +import org.cibseven.community.rest.client.api.DeploymentApi; +import org.cibseven.community.rest.client.invoker.ApiException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -20,21 +20,21 @@ import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.util.DigestUtils; -/** Auto deploys all Camunda resources found on classpath during startup of the application */ +/** Auto deploys all CIB seven resources found on classpath during startup of the application */ @AutoConfiguration -@EnableConfigurationProperties(CamundaAutodeploymentProperties.class) -public class CamundaProcessAutodeployment { +@EnableConfigurationProperties(CibSevenAutodeploymentProperties.class) +public class CibSevenProcessAutodeployment { - private static final Logger logger = LoggerFactory.getLogger(CamundaProcessAutodeployment.class); + private static final Logger logger = LoggerFactory.getLogger(CibSevenProcessAutodeployment.class); private final DeploymentApi deploymentApi; private final ResourcePatternResolver patternResolver; - private final CamundaAutodeploymentProperties properties; + private final CibSevenAutodeploymentProperties properties; private final String applicationName; - public CamundaProcessAutodeployment( + public CibSevenProcessAutodeployment( DeploymentApi deploymentApi, ResourcePatternResolver patternResolver, - CamundaAutodeploymentProperties properties, + CibSevenAutodeploymentProperties properties, @Value("${spring.application.name:spring-app}") String applicationName) { this.deploymentApi = deploymentApi; this.patternResolver = patternResolver; @@ -44,7 +44,7 @@ public CamundaProcessAutodeployment( // TODO Possible extension: Provide a @Deployment annotation like Spring Zeebe @EventListener(ApplicationStartedEvent.class) - public void deployCamundaResources() throws IOException, ApiException { + public void deployCibSevenResources() throws IOException, ApiException { if (!properties.isEnabled()) { return; } @@ -59,7 +59,7 @@ public void deployCamundaResources() throws IOException, ApiException { private void deployResources(List resourcesToDeploy, String type) throws IOException, ApiException { logger.info("Found resources for deployment of type " + type + ": " + resourcesToDeploy); - for (Resource camundaResource : resourcesToDeploy) { + for (Resource resource : resourcesToDeploy) { // We have to create a tmpFile because we need to read the files via InputStream to work also // in a jar-packed environment // but the OpenAPI will need a File. @@ -67,13 +67,13 @@ private void deployResources(List resourcesToDeploy, String type) // (because otherwise the deployer will not pick it up as e.g. BPMN file) try { String tempDirectoryName = FileUtils.getTempDirectory().getAbsolutePath(); - String filename = getResourceFilename(camundaResource, type); + String filename = getResourceFilename(resource, type); final File tempFile = new File(tempDirectoryName + File.separator + filename); tempFile.deleteOnExit(); try (FileOutputStream out = new FileOutputStream(tempFile)) { - IOUtils.copy(camundaResource.getInputStream(), out); + IOUtils.copy(resource.getInputStream(), out); } - logger.info(" - Now deploying: " + camundaResource); + logger.info(" - Now deploying: " + resource); deploymentApi.createDeployment( null, null, @@ -90,15 +90,15 @@ private void deployResources(List resourcesToDeploy, String type) } } // deploying the files one by one because of limitation of OpenAPI at the moment - // see https://jira.camunda.com/browse/CAM-13105 + // see https://github.com/cibseven/cibseven/issues/CAM-13105 } } - private String getResourceFilename(Resource camundaResource, String type) throws IOException { - if (camundaResource.getFilename() != null) { - return camundaResource.getFilename(); + private String getResourceFilename(Resource resource, String type) throws IOException { + if (resource.getFilename() != null) { + return resource.getFilename(); } else { - return DigestUtils.md5DigestAsHex(camundaResource.getInputStream()) + '.' + type; + return DigestUtils.md5DigestAsHex(resource.getInputStream()) + '.' + type; } } } diff --git a/cibseven-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cibseven-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..5965cdc --- /dev/null +++ b/cibseven-engine-rest-client-openapi-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +org.cibseven.community.rest.client.springboot.CibSevenOpenApiStarter +org.cibseven.community.rest.client.springboot.CibSevenApi +org.cibseven.community.rest.client.springboot.CibSevenHistoryApi +org.cibseven.community.rest.client.springboot.CibSevenProcessAutodeployment diff --git a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/AppTest.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/AppTest.java similarity index 85% rename from camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/AppTest.java rename to cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/AppTest.java index 2f3cb29..ea9fc15 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/AppTest.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/AppTest.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import static org.assertj.core.api.Assertions.*; @@ -8,8 +8,8 @@ @SpringBootTest public class AppTest { - @Autowired CamundaAutodeploymentProperties properties; - @Autowired CamundaOpenApiStarter starter; + @Autowired CibSevenAutodeploymentProperties properties; + @Autowired CibSevenOpenApiStarter starter; @Test void shouldRun() {} diff --git a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaApiTest.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenApiTest.java similarity index 83% rename from camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaApiTest.java rename to cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenApiTest.java index 69756e7..925ed4b 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaApiTest.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenApiTest.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import static org.assertj.core.api.Assertions.*; @@ -12,14 +12,14 @@ import org.springframework.context.ApplicationContext; @SpringBootTest -public class CamundaApiTest { +public class CibSevenApiTest { @Autowired ApplicationContext applicationContext; @TestFactory Stream shouldHaveAllApisAsBean() { List> allApis = ReflectionSupport.findAllClassesInPackage( - "org.camunda.community.rest.client.api", c -> !c.isAnonymousClass(), s -> true); + "org.cibseven.community.rest.client.api", c -> !c.isAnonymousClass(), s -> true); return allApis.stream() .map( c -> diff --git a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarterTest.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarterTest.java similarity index 62% rename from camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarterTest.java rename to cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarterTest.java index 8dc044d..ffbacae 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/CamundaOpenApiStarterTest.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenOpenApiStarterTest.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import static org.assertj.core.api.Assertions.*; @@ -8,12 +8,12 @@ @SpringBootTest( properties = { - "camunda.bpm.client.basic-auth.username=username", - "camunda.bpm.client.basic-auth.password=password", - "camunda.bpm.client.base-url=http://base-url/engine-rest" + "cibseven.bpm.client.basic-auth.username=username", + "cibseven.bpm.client.basic-auth.password=password", + "cibseven.bpm.client.base-url=http://base-url/engine-rest" }) -public class CamundaOpenApiStarterTest { - @Autowired CamundaOpenApiStarter starter; +public class CibSevenOpenApiStarterTest { + @Autowired CibSevenOpenApiStarter starter; @Test void shouldSetBaseUrl() { diff --git a/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenPropertiesTest.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenPropertiesTest.java new file mode 100644 index 0000000..72c26b4 --- /dev/null +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/CibSevenPropertiesTest.java @@ -0,0 +1,27 @@ +package org.cibseven.community.rest.client.springboot; + +import static org.assertj.core.api.Assertions.*; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest( + properties = { + "cibseven.bpm.client.base-url=http://new-url/engine-rest", + "cibseven.bpm.client.basic-auth.username=newuser", + "cibseven.bpm.client.basic-auth.password=newpass" + }) +public class CibSevenPropertiesTest { + @Autowired CibSevenOpenApiStarter starter; + + @Test + void shouldRun() {} + + @Test + void shouldUseCibSevenProperties() { + assertThat(starter.getBasePath()).isEqualTo("http://new-url/engine-rest"); + assertThat(starter.getUsername()).isEqualTo("newuser"); + // Note: password test omitted for security + } +} diff --git a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/LegacyPropertiesTest.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/LegacyPropertiesTest.java similarity index 65% rename from camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/LegacyPropertiesTest.java rename to cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/LegacyPropertiesTest.java index ebb2ac2..930c693 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/LegacyPropertiesTest.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/LegacyPropertiesTest.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import static org.assertj.core.api.Assertions.*; @@ -8,14 +8,14 @@ @SpringBootTest( properties = { - "camunda.autoDeploy.bpmnResources=custom", - "camunda.autoDeploy.dmnResources=custom", - "camunda.autoDeploy.formResources=custom", - "camunda.autoDeploy.enabled=false", - "camunda.autoDeploy.failStartupOnError=false" + "cibseven.autoDeploy.bpmnResources=custom", + "cibseven.autoDeploy.dmnResources=custom", + "cibseven.autoDeploy.formResources=custom", + "cibseven.autoDeploy.enabled=false", + "cibseven.autoDeploy.failStartupOnError=false" }) public class LegacyPropertiesTest { - @Autowired CamundaAutodeploymentProperties properties; + @Autowired CibSevenAutodeploymentProperties properties; @Test void shouldRun() {} diff --git a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/TestApp.java b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/TestApp.java similarity index 82% rename from camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/TestApp.java rename to cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/TestApp.java index f1f9c7a..a81413d 100644 --- a/camunda-engine-rest-client-openapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/TestApp.java +++ b/cibseven-engine-rest-client-openapi-springboot/src/test/java/org/cibseven/community/rest/client/springboot/TestApp.java @@ -1,4 +1,4 @@ -package org.camunda.community.rest.client.springboot; +package org.cibseven.community.rest.client.springboot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/pom.xml b/pom.xml index c71ef8d..7d7eb28 100644 --- a/pom.xml +++ b/pom.xml @@ -3,16 +3,16 @@ 4.0.0 - org.camunda.community - community-hub-release-parent - 2.1.0 + org.cibseven.community + release-parent + 1.0.0 - org.camunda.community - camunda-engine-rest-client-root - 7.23.0-SNAPSHOT + org.cibseven.community + cibseven-engine-rest-client-root + 2.1.0-SNAPSHOT pom - Camunda Engine REST Client Root + CIB seven Engine REST Client Root Apache License, Version 2.0 @@ -21,9 +21,9 @@ - camunda-engine-rest-client-openapi-java - camunda-engine-rest-client-openapi-springboot - camunda-engine-rest-client-complete-springboot-starter + cibseven-engine-rest-client-openapi-java + cibseven-engine-rest-client-openapi-springboot + cibseven-engine-rest-client-complete-springboot-starter @@ -32,7 +32,7 @@ 17 17 - 7.23.0 + 2.0.0 3.5.4 @@ -46,9 +46,9 @@ import - org.camunda.bpm - camunda-bom - ${camunda.version} + org.cibseven.bpm + cibseven-bom + ${cibseven.version} pom import @@ -68,13 +68,13 @@ 2.20.0 - org.camunda.community - camunda-engine-rest-client-openapi-java + org.cibseven.community + cibseven-engine-rest-client-openapi-java ${project.version} - org.camunda.community - camunda-engine-rest-client-openapi-springboot + org.cibseven.community + cibseven-engine-rest-client-openapi-springboot ${project.version} @@ -129,6 +129,16 @@ maven-site-plugin 3.21.0 + + org.apache.maven.plugins + maven-install-plugin + 3.1.4 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + com.diffplug.spotless spotless-maven-plugin