From 9fef934d3a785f86eaffd0a1c54eb3d1cc43f0a5 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Wed, 19 Jun 2024 06:35:36 +0200 Subject: [PATCH 1/9] revival --- .github/ISSUE_TEMPLATE/bug_report.md | 47 ++ .github/ISSUE_TEMPLATE/documentation_issue.md | 13 + .github/ISSUE_TEMPLATE/feature_request.md | 21 + .github/workflows/gradle-publish.yml | 46 -- .github/workflows/mvn-build.yml | 23 + .github/workflows/mvn-release.yml | 58 +++ .gitignore | 1 + CODE_OF_CONDUCT.md | 4 +- CONTRIBUTING.md | 2 +- README.md | 24 +- build.gradle | 104 ----- extension/java-client-operate/README.md | 31 ++ extension/java-client-operate/pom.xml | 61 +++ .../camunda/operate/CamundaOperateClient.java | 233 ++++++++++ .../CamundaOperateClientConfiguration.java | 6 + .../camunda/operate/auth/Authentication.java | 10 + .../auth/DefaultNoopAuthentication.java | 33 ++ .../operate/auth/JwtAuthentication.java | 81 ++++ .../camunda/operate/auth/JwtCredential.java | 4 + .../operate/auth/SimpleAuthentication.java | 80 ++++ .../operate/auth/SimpleCredential.java | 8 + .../camunda/operate/auth/TokenResponse.java | 51 +++ .../operate/exception/OperateException.java | 20 + .../operate/exception/SdkException.java | 18 + .../operate/http/DefaultHttpClient.java | 275 ++++++++++++ .../io/camunda/operate/http/HttpClient.java | 24 + .../io/camunda/operate/http/Java8Utils.java | 37 ++ .../camunda/operate/model/ChangeStatus.java | 23 + .../operate/model/DecisionDefinition.java | 95 ++++ .../operate/model/DecisionInstance.java | 151 +++++++ .../operate/model/DecisionInstanceInput.java | 32 ++ .../operate/model/DecisionInstanceOutput.java | 50 +++ .../operate/model/DecisionRequirements.java | 68 +++ .../camunda/operate/model/DecisionState.java | 8 + .../camunda/operate/model/DecisionType.java | 8 + .../operate/model/FlowNodeInstance.java | 114 +++++ .../operate/model/FlowNodeInstanceState.java | 8 + .../operate/model/FlowNodeStatistics.java | 50 +++ .../io/camunda/operate/model/Incident.java | 78 ++++ .../camunda/operate/model/ListTypeToken.java | 11 + .../operate/model/ProcessDefinition.java | 49 ++ .../operate/model/ProcessInstance.java | 87 ++++ .../operate/model/ProcessInstanceState.java | 7 + .../camunda/operate/model/SearchResult.java | 40 ++ .../operate/model/SearchResultTypeToken.java | 24 + .../io/camunda/operate/model/Variable.java | 73 +++ .../io/camunda/operate/search/DateFilter.java | 42 ++ .../operate/search/DateFilterRange.java | 21 + .../operate/search/DateFilterSerializer.java | 27 ++ .../search/DecisionDefinitionFilter.java | 10 + .../DecisionDefinitionFilterBuilder.java | 65 +++ .../search/DecisionInstanceFilter.java | 10 + .../search/DecisionInstanceFilterBuilder.java | 102 +++++ .../search/DecisionRequirementsFilter.java | 10 + .../DecisionRequirementsFilterBuilder.java | 49 ++ .../io/camunda/operate/search/Filter.java | 4 +- .../search/FlowNodeInstanceFilter.java | 10 + .../search/FlowNodeInstanceFilterBuilder.java | 77 ++++ .../operate/search/IncidentFilter.java | 10 + .../operate/search/IncidentFilterBuilder.java | 56 +++ .../search/ProcessDefinitionFilter.java | 10 + .../ProcessDefinitionFilterBuilder.java | 39 ++ .../operate/search/ProcessInstanceFilter.java | 10 + .../search/ProcessInstanceFilterBuilder.java | 62 +++ .../camunda/operate/search/SearchQuery.java | 103 +++++ .../java/io/camunda/operate/search/Sort.java | 34 ++ .../io/camunda/operate/search/SortOrder.java | 3 +- .../operate/search/VariableFilter.java | 10 + .../operate/search/VariableFilterBuilder.java | 49 ++ .../operate/http/DefaultHttpClientTest.java | 122 +++++ extension/pom.xml | 29 ++ .../pom.xml | 25 ++ .../spring/OperateClientConfiguration.java | 73 +++ .../OperateClientConfigurationProperties.java | 30 ++ .../OperatePropertiesPostProcessor.java | 48 ++ .../main/resources/META-INF/spring.factories | 1 + ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/application.yaml | 0 .../main/resources/operate-profiles/oidc.yaml | 8 + .../main/resources/operate-profiles/saas.yaml | 7 + .../resources/operate-profiles/simple.yaml | 8 + gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 234 ---------- gradlew.bat | 89 ---- pom.xml | 423 ++++++++++++++++++ settings.gradle | 1 - .../camunda/operate/CamundaOperateClient.java | 286 ------------ .../operate/CamundaOperateConstants.java | 20 - .../camunda/operate/auth/AuthInterface.java | 8 - .../operate/auth/JwtAuthentication.java | 39 -- .../auth/LocalIdentityAuthentication.java | 98 ---- .../operate/auth/SaasAuthentication.java | 61 --- .../auth/SelfManagedAuthentication.java | 105 ----- .../operate/auth/SimpleAuthentication.java | 57 --- .../beta/CamundaOperateBetaClient.java | 102 ----- .../operate/beta/model/AuditTrail.java | 39 -- .../operate/beta/model/AuditTrailStep.java | 43 -- .../beta/model/FlowNodeInstanceQuery.java | 36 -- .../beta/model/FlowNodeInstanceQueryList.java | 36 -- .../camunda/operate/dto/FlownodeInstance.java | 90 ---- .../operate/dto/FlownodeInstanceState.java | 5 - .../java/io/camunda/operate/dto/Incident.java | 62 --- .../operate/dto/ProcessDefinition.java | 39 -- .../camunda/operate/dto/ProcessInstance.java | 87 ---- .../operate/dto/ProcessInstanceState.java | 5 - .../io/camunda/operate/dto/SearchResult.java | 41 -- .../java/io/camunda/operate/dto/Variable.java | 73 --- .../operate/exception/OperateException.java | 25 -- .../io/camunda/operate/search/DateFilter.java | 44 -- .../operate/search/DateFilterRange.java | 16 - .../operate/search/DateFilterSerializer.java | 30 -- .../search/FlownodeInstanceFilter.java | 183 -------- .../operate/search/IncidentFilter.java | 93 ---- .../search/ProcessDefinitionFilter.java | 64 --- .../operate/search/ProcessInstanceFilter.java | 151 ------- .../camunda/operate/search/SearchQuery.java | 106 ----- .../java/io/camunda/operate/search/Sort.java | 35 -- .../operate/search/VariableFilter.java | 87 ---- .../io/camunda/operate/util/Java8Utils.java | 51 --- .../io/camunda/operate/util/JsonUtils.java | 59 --- .../operate/util/QueryValidatorUtils.java | 43 -- 122 files changed, 3709 insertions(+), 2818 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/documentation_issue.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/workflows/gradle-publish.yml create mode 100644 .github/workflows/mvn-build.yml create mode 100644 .github/workflows/mvn-release.yml delete mode 100644 build.gradle create mode 100644 extension/java-client-operate/README.md create mode 100644 extension/java-client-operate/pom.xml create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleCredential.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponse.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/exception/OperateException.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/exception/SdkException.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/http/Java8Utils.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ChangeStatus.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionDefinition.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstance.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceInput.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceOutput.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionRequirements.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionState.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionType.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstance.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstanceState.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeStatistics.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/Incident.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessDefinition.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstanceState.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResult.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/Variable.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterRange.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterSerializer.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilterBuilder.java rename {src => extension/java-client-operate/src}/main/java/io/camunda/operate/search/Filter.java (55%) create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilterBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/SearchQuery.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/Sort.java rename {src => extension/java-client-operate/src}/main/java/io/camunda/operate/search/SortOrder.java (80%) create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilter.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilterBuilder.java create mode 100644 extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java create mode 100644 extension/pom.xml create mode 100644 extension/spring-boot-starter-camunda-operate/pom.xml create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperatePropertiesPostProcessor.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring.factories create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/oidc.yaml create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/saas.yaml create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/simple.yaml delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat create mode 100644 pom.xml delete mode 100644 settings.gradle delete mode 100644 src/main/java/io/camunda/operate/CamundaOperateClient.java delete mode 100644 src/main/java/io/camunda/operate/CamundaOperateConstants.java delete mode 100644 src/main/java/io/camunda/operate/auth/AuthInterface.java delete mode 100644 src/main/java/io/camunda/operate/auth/JwtAuthentication.java delete mode 100644 src/main/java/io/camunda/operate/auth/LocalIdentityAuthentication.java delete mode 100644 src/main/java/io/camunda/operate/auth/SaasAuthentication.java delete mode 100644 src/main/java/io/camunda/operate/auth/SelfManagedAuthentication.java delete mode 100644 src/main/java/io/camunda/operate/auth/SimpleAuthentication.java delete mode 100644 src/main/java/io/camunda/operate/beta/CamundaOperateBetaClient.java delete mode 100644 src/main/java/io/camunda/operate/beta/model/AuditTrail.java delete mode 100644 src/main/java/io/camunda/operate/beta/model/AuditTrailStep.java delete mode 100644 src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQuery.java delete mode 100644 src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQueryList.java delete mode 100644 src/main/java/io/camunda/operate/dto/FlownodeInstance.java delete mode 100644 src/main/java/io/camunda/operate/dto/FlownodeInstanceState.java delete mode 100644 src/main/java/io/camunda/operate/dto/Incident.java delete mode 100644 src/main/java/io/camunda/operate/dto/ProcessDefinition.java delete mode 100644 src/main/java/io/camunda/operate/dto/ProcessInstance.java delete mode 100644 src/main/java/io/camunda/operate/dto/ProcessInstanceState.java delete mode 100644 src/main/java/io/camunda/operate/dto/SearchResult.java delete mode 100644 src/main/java/io/camunda/operate/dto/Variable.java delete mode 100644 src/main/java/io/camunda/operate/exception/OperateException.java delete mode 100644 src/main/java/io/camunda/operate/search/DateFilter.java delete mode 100644 src/main/java/io/camunda/operate/search/DateFilterRange.java delete mode 100644 src/main/java/io/camunda/operate/search/DateFilterSerializer.java delete mode 100644 src/main/java/io/camunda/operate/search/FlownodeInstanceFilter.java delete mode 100644 src/main/java/io/camunda/operate/search/IncidentFilter.java delete mode 100644 src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java delete mode 100644 src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java delete mode 100644 src/main/java/io/camunda/operate/search/SearchQuery.java delete mode 100644 src/main/java/io/camunda/operate/search/Sort.java delete mode 100644 src/main/java/io/camunda/operate/search/VariableFilter.java delete mode 100644 src/main/java/io/camunda/operate/util/Java8Utils.java delete mode 100644 src/main/java/io/camunda/operate/util/JsonUtils.java delete mode 100644 src/main/java/io/camunda/operate/util/QueryValidatorUtils.java diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..8a3d101 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,47 @@ +--- + +name: Bug report +about: Create a report to help us improve +title: '' +labels: 'kind/bug' +assignees: '' + +--- + +**Describe the bug** + + + +**To Reproduce** + + + +**Expected behavior** + + + +**Log/Stacktrace** + + + +
Full Stacktrace +

+ +``` + +``` + +

+
+ +**Environment:** +- OS: +- Deployment: +- Spring-Zeebe Version: +- SpringBoot Version: +- Configuration: diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md new file mode 100644 index 0000000..d6d22ce --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation_issue.md @@ -0,0 +1,13 @@ +--- + +name: Documentation issue +about: Changes to the documentation +title: '' +labels: 'kind/documentation' +assignees: '' + +--- + +**Description** + +A clear and concise description of what this issue is about. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..a3fbc02 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,21 @@ +--- + +name: Feature request +about: Suggest an idea for this project +title: '' +labels: 'kind/feature' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml deleted file mode 100644 index bf8cd6d..0000000 --- a/.github/workflows/gradle-publish.yml +++ /dev/null @@ -1,46 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle - -name: Gradle Package - -on: - release: - types: [created] - -jobs: - publish: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'adopt' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: Build with Gradle - uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee - with: - arguments: build - - name: Publish with Gradle - run: ./gradlew -Prelease publishToSonatype closeAndReleaseSonatypeStagingRepository - env: - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_DEPLOYMENT_USR }} - ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.MAVEN_CENTRAL_DEPLOYMENT_PSW }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_ID }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_SEC }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_PASSPHRASE }} - - diff --git a/.github/workflows/mvn-build.yml b/.github/workflows/mvn-build.yml new file mode 100644 index 0000000..16be156 --- /dev/null +++ b/.github/workflows/mvn-build.yml @@ -0,0 +1,23 @@ +name: Build via Maven and run tests + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Cache + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'adopt' + - name: Build with Maven + run: mvn verify -PcheckFormat -B diff --git a/.github/workflows/mvn-release.yml b/.github/workflows/mvn-release.yml new file mode 100644 index 0000000..9aac04c --- /dev/null +++ b/.github/workflows/mvn-release.yml @@ -0,0 +1,58 @@ +# If this workflow is triggered by a push to either main or release branches then it +# deploys a SNAPSHOT +# If this workflow is triggered by publishing a Release, it +# deploys a RELEASE with the selected version +# updates the project version by incrementing the patch version +# commits the version update change to the repository's branch that triggered the workflow. +name: Deploy artifacts with Maven + +on: + push: + branches: + - main + - release/** + release: + types: [ published ] +jobs: + publish: + runs-on: ubuntu-22.04 + steps: + + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up Java environment + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'adopt' + cache: maven + 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@v1 + with: + release-version: ${{ github.event.release.tag_name }} + maven-url: s01.oss.sonatype.org + nexus-usr: ${{ secrets.NEXUS_USR }} + nexus-psw: ${{ secrets.NEXUS_PSW }} + maven-usr: ${{ secrets.MAVEN_CENTRAL_DEPLOYMENT_USR }} + maven-psw: ${{ secrets.MAVEN_CENTRAL_DEPLOYMENT_PSW }} + maven-additional-options: -U + maven-gpg-passphrase: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_PASSPHRASE }} + maven-auto-release-after-close: true + github-token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ github.event.release.target_commitish || github.ref_name }} + id: release + + - if: github.event.release + name: Attach artifacts to GitHub Release (Release only) + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ${{ steps.release.outputs.artifacts_archive_path }} + asset_name: ${{ steps.release.outputs.artifacts_archive_path }} + asset_content_type: application/zip diff --git a/.gitignore b/.gitignore index c2065bc..6d9ba77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ HELP.md .gradle build/ +target !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ad441c4..34de802 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ -# Code of Conduct +# Code of Conduct -### View the [Camunda Code of Conduct](https://camunda.com/events/code-conduct/) and find ways to report violations. \ No newline at end of file +### View the [Camunda Code of Conduct](https://camunda.com/events/code-conduct/) and find ways to report violations. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 84e495c..ae0f230 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -59,4 +59,4 @@ These are roles that are not code-based, but require some knowledge in that you - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/) - [Using Pull Requests](https://help.github.com/articles/about-pull-requests/) - [GitHub Help](https://help.github.com) -- [CODE_OF_CONDUCT](https://github.com/camunda-community-hub/community/blob/main/CODE_OF_CONDUCT.MD) \ No newline at end of file +- [CODE_OF_CONDUCT](https://github.com/camunda-community-hub/community/blob/main/CODE_OF_CONDUCT.MD) diff --git a/README.md b/README.md index 19f61b6..6506ece 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,7 @@ ![Compatible with: Camunda Platform 8](https://img.shields.io/badge/Compatible%20with-Camunda%20Platform%208-0072Ce) [![](https://img.shields.io/badge/Lifecycle-Incubating-blue)](https://github.com/Camunda-Community-Hub/community/blob/main/extension-lifecycle.md#incubating-) -# DEPRECATED - -:information_source: **This project is no more maintained** and you should start using the project provided as part of the [Spring Zeebe project](https://github.com/camunda-community-hub/spring-zeebe). If you want to use it outside of the Spring Zeebe client, you can directly use the [java-operate-client](https://github.com/camunda-community-hub/spring-zeebe/tree/main/camunda-sdk-java/java-client-operate). +# Camunda Operate Client This project is designed to simplify communication between a Java backend and the [Operate API of Camunda Platform 8](https://docs.camunda.io/docs/apis-clients/operate-api/). @@ -44,7 +42,7 @@ CamundaOperateClient client = new CamundaOperateClient.Builder().authentication( ## Getting and Searching -When you search objects, you can get results as List or as SearchResult. The SearchResult gives you a sortValues that you can use to paginate your results : +When you search objects, you can get results as List or as SearchResult. The SearchResult gives you a sortValues that you can use to paginate your results : ```java SearchQuery query = new SearchQuery.Builder().filter(someFilter).sort(new Sort("name", SortOrder.ASC)).size(20).searchAfter(previousResult.getSortValues()).build(); @@ -75,7 +73,7 @@ SearchQuery instanceQuery = new SearchQuery.Builder().filter(instanceFilter).siz List list = client.searchProcessInstances(instanceQuery); SearchResult result = client.searchProcessInstanceResults(instanceQuery); - + //get a process instance by its key ProcessInstance instance = client.getProcessInstance(instances.get(0).getKey()); ``` @@ -89,7 +87,7 @@ FlownodeInstanceFilter flownodeFilter = new FlownodeInstanceFilter.Builder() SearchQuery flownodeQuery = new SearchQuery.Builder().filter(flownodeFilter).size(20).sort(new Sort("state", SortOrder.ASC)).build(); List flownodes = client.searchFlownodeInstances(flownodeQuery); - + //get a flownode instance by its key FlownodeInstance flownodes = client.getFlownodeInstance(flownodes.get(0).getKey()); ``` @@ -102,19 +100,19 @@ VariableFilter variableFilter = new VariableFilter.Builder().processInstanceKey( SearchQuery varQuery = new SearchQuery.Builder().filter(variableFilter).size(5).sort(new Sort("name", SortOrder.ASC)).build(); List variables = client.searchVariables(varQuery); - + //get a variable by its key Variable var = client.getVariable(variables.get(0).getKey()); ``` ### Incidents -```java +```java //search incidents based on filters IncidentFilter incidentFilter = new IncidentFilter.Builder().creationTime(new DateFilter(new Date(), DateFilterRange.YEAR)).build(); SearchQuery incidentQuery = new SearchQuery.Builder().filter(incidentFilter).size(20).sort(new Sort("state", SortOrder.ASC)).build(); List incidents = client.searchIncidents(incidentQuery); - + //get a incident by its key Incident incident = client.getIncident(incidents.get(0).getKey()); ``` @@ -129,7 +127,7 @@ SimpleAuthentication sa = new SimpleAuthentication("demo", "demo", "http://local CamundaOperateClient client = new CamundaOperateClient.Builder().beta().operateUrl("http://localhost:8081").authentication(sa).build(); JsonNode json = ((CamundaOperateBetaClient) client).getFlowNodeStates(2L); - + AuditTrail auditTrail = ((CamundaOperateBetaClient) client).getAuditTrail(2L); ``` @@ -140,9 +138,9 @@ You can import it to your maven or gradle project as a dependency ```xml - io.camunda - camunda-operate-client-java - 8.3.0.1 + io.camunda + camunda-operate-client-java + 8.3.0.1 ``` diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 5000f69..0000000 --- a/build.gradle +++ /dev/null @@ -1,104 +0,0 @@ -plugins { - id 'maven-publish' - id 'java-library' - id 'signing' - id('io.github.gradle-nexus.publish-plugin') version '1.1.0' -} - -group = 'io.camunda' -version = '8.3.0.1' -sourceCompatibility = '8' - -repositories { - mavenCentral() -} - -dependencies { - def httpClientVersion = "5.1.3" - def zeebeBpmnVersion = "8.3.0-rc1" - api "org.apache.httpcomponents.client5:httpclient5:${httpClientVersion}" - api "org.apache.httpcomponents.client5:httpclient5-fluent:${httpClientVersion}" - - api 'com.fasterxml.jackson.core:jackson-databind:2.13.1' - compileOnly "io.camunda:zeebe-bpmn-model:${zeebeBpmnVersion}" - - testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.1' -} - -tasks.named('test') { - useJUnitPlatform() -} - -task sourceJar(type: Jar) { - outputs.cacheIf { true } - from sourceSets.main.allJava - archiveClassifier = 'sources' -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - from javadoc.destinationDir - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveClassifier = 'javadoc' -} -java { - withSourcesJar() - withJavadocJar() -} - -nexusPublishing { - transitionCheckOptions { - maxRetries.set(100) - delayBetween.set(Duration.ofSeconds(10)) - } - repositories { - sonatype { - stagingProfileId = "13992b29744076" - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - } - } -} - -signing { - useInMemoryPgpKeys(System.getenv("ORG_GRADLE_PROJECT_signingKey"), System.getenv("ORG_GRADLE_PROJECT_signingPassword")) - sign(publishing.publications) -} - -publishing { - publications { - mavenJava(MavenPublication) { - from(components.java) - versionMapping { - usage('java-api') { - fromResolutionResult() - } - } - pom { - groupId = 'io.camunda' - artifactId = 'camunda-operate-client-java' - packaging = 'jar' - name = 'Camunda 8 Operate Java Client' - description = "Java client for the Operate API of Camunda Platform 8" - url = "https://github.com/camunda-community-hub/camunda-operate-client-java" - licenses { - license { - name = "The Apache License, Version 2.0" - url = "http://www.apache.org/licenses/LICENSE-2.0.txt" - } - } - developers { - developer { - name = "christophe.dame" - email = "christophe.dame@camunda.com" - } - } - scm { - connection = "scm:git:git@github.com:camunda-community-hub/camunda-operate-client-java.git" - developerConnection = "scm:git:git@github.com:camunda-community-hub/camunda-operate-client-java.git" - url = "https://github.com/camunda-community-hub/camunda-operate-client-java" - } - } - } - } -} - diff --git a/extension/java-client-operate/README.md b/extension/java-client-operate/README.md new file mode 100644 index 0000000..c09ac4e --- /dev/null +++ b/extension/java-client-operate/README.md @@ -0,0 +1,31 @@ +# Java Operate client + +The Spring Boot Starter contains the Operate client which becomes injectable as a bean. + +```java +@Autowired CamundaOperateClient operateClient; +``` + +### List deployed process definitions + +```java + ProcessDefinitionFilter processDefinitionFilter = ProcessDefinitionFilter.builder().build(); + SearchQuery procDefQuery = new SearchQuery.Builder() + .filter(processDefinitionFilter) + .size(1000) + .sort(new Sort("version", SortOrder.DESC)) + .build(); + return camundaOperateClient.searchProcessDefinitions(procDefQuery); +``` + +### Read process definitions content + +```java + camundaOperateClient.getProcessDefinitionXml(ProcessDefinitionKey); +``` + +### List variables + +```java + return camundaOperateClient.searchVariables(new SearchQuery.Builder().filter(new VariableFilter()).size(100).build()); +``` diff --git a/extension/java-client-operate/pom.xml b/extension/java-client-operate/pom.xml new file mode 100644 index 0000000..823b445 --- /dev/null +++ b/extension/java-client-operate/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + io.camunda.spring + operate-client-parent + 8.6.0-alpha1-SNAPSHOT + + + java-client-operate + + + + io.camunda + zeebe-bpmn-model + + + io.camunda + spring-boot-starter-camunda-sdk + 8.5.3 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.3.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.17.1 + + + com.google.guava + guava + 33.2.1-jre + + + org.junit.jupiter + junit-jupiter + 5.10.2 + test + + + org.mockito + mockito-core + 5.12.0 + test + + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + + + + + UTF-8 + + + diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java new file mode 100644 index 0000000..88bf79e --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java @@ -0,0 +1,233 @@ +package io.camunda.operate; + +import io.camunda.operate.exception.OperateException; +import io.camunda.operate.http.DefaultHttpClient; +import io.camunda.operate.http.HttpClient; +import io.camunda.operate.model.*; +import io.camunda.operate.search.SearchQuery; +import io.camunda.zeebe.model.bpmn.Bpmn; +import io.camunda.zeebe.model.bpmn.BpmnModelInstance; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class CamundaOperateClient { + + private final HttpClient httpClient; + + public CamundaOperateClient(HttpClient httpClient) { + this.httpClient = httpClient; + } + + public CamundaOperateClient(CamundaOperateClientConfiguration configuration) { + this(buildOperateHttpClient(configuration)); + } + + private static HttpClient buildOperateHttpClient( + CamundaOperateClientConfiguration configuration) { + HttpClient httpClient = new DefaultHttpClient(configuration.authentication()); + httpClient.init(formatUrl(configuration.baseUrl().toString()), "/v1"); + // load the config map + Map, String> map = new HashMap<>(); + map.put(ProcessInstance.class, "/process-instances"); + map.put(ListTypeToken.listFlowNodeStatistics.getClass(), "/process-instances/{key}/statistics"); + map.put(ListTypeToken.listSequenceFlows.getClass(), "/process-instances/{key}/sequence-flows"); + map.put(ProcessDefinition.class, "/process-definitions"); + map.put(FlowNodeInstance.class, "/flownode-instances"); + map.put(Incident.class, "/incidents"); + map.put(Variable.class, "/variables"); + map.put(DecisionDefinition.class, "/decision-definitions"); + map.put(DecisionRequirements.class, "/drd"); + map.put(DecisionInstance.class, "/decision-instances"); + map.put( + SearchResultTypeToken.searchResultProcessDefinition.getClass(), + "/process-definitions/search"); + map.put( + SearchResultTypeToken.searchResultDecisionDefinition.getClass(), + "/decision-definitions/search"); + map.put( + SearchResultTypeToken.searchResultDecisionInstance.getClass(), + "/decision-instances/search"); + map.put( + SearchResultTypeToken.searchResultFlowNodeInstance.getClass(), + "/flownode-instances/search"); + map.put(SearchResultTypeToken.searchResultVariable.getClass(), "/variables/search"); + map.put( + SearchResultTypeToken.searchResultProcessInstance.getClass(), "/process-instances/search"); + map.put(SearchResultTypeToken.searchResultDecisionRequirements.getClass(), "/drd/search"); + map.put(SearchResultTypeToken.searchResultIncident.getClass(), "/incidents/search"); + httpClient.loadMap(map); + return httpClient; + } + + private static String formatUrl(String url) { + if (url.endsWith("/")) { + return url.substring(0, url.length() - 1); + } + return url; + } + + public ProcessDefinition getProcessDefinition(Long key) throws OperateException { + return httpClient.get(ProcessDefinition.class, key); + } + + public BpmnModelInstance getProcessDefinitionModel(Long key) throws OperateException { + String xml = getProcessDefinitionXml(key); + try { + InputStream processInputStream = new ByteArrayInputStream(xml.getBytes()); + return Bpmn.readModelFromStream(processInputStream); + } catch (Exception e) { + throw new OperateException(e); + } + } + + public String getProcessDefinitionXml(Long key) throws OperateException { + return httpClient.getXml(ProcessDefinition.class, key); + } + + public List searchProcessDefinitions(SearchQuery query) + throws OperateException { + return searchProcessDefinitionResults(query).getItems(); + } + + public SearchResult searchProcessDefinitionResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + ProcessDefinition.class, + SearchResultTypeToken.searchResultProcessDefinition, + query); + } + + public List searchDecisionDefinitions(SearchQuery query) + throws OperateException { + return searchDecisionDefinitionResults(query).getItems(); + } + + public SearchResult searchDecisionDefinitionResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + DecisionDefinition.class, + SearchResultTypeToken.searchResultDecisionDefinition, + query); + } + + public List searchDecisionInstances(SearchQuery query) throws OperateException { + return searchDecisionInstanceResults(query).getItems(); + } + + public SearchResult searchDecisionInstanceResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + DecisionInstance.class, + SearchResultTypeToken.searchResultDecisionInstance, + query); + } + + public List searchFlowNodeInstances(SearchQuery query) throws OperateException { + return searchFlowNodeInstanceResults(query).getItems(); + } + + public SearchResult searchFlowNodeInstanceResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + FlowNodeInstance.class, + SearchResultTypeToken.searchResultFlowNodeInstance, + query); + } + + public List searchVariables(SearchQuery query) throws OperateException { + return searchVariableResults(query).getItems(); + } + + public SearchResult searchVariableResults(SearchQuery query) throws OperateException { + return httpClient.post( + SearchResult.class, Variable.class, SearchResultTypeToken.searchResultVariable, query); + } + + public List searchProcessInstances(SearchQuery query) throws OperateException { + return searchProcessInstanceResults(query).getItems(); + } + + public SearchResult searchProcessInstanceResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + ProcessInstance.class, + SearchResultTypeToken.searchResultProcessInstance, + query); + } + + public List searchDecisionRequirements(SearchQuery query) + throws OperateException { + return searchDecisionRequirementsResults(query).getItems(); + } + + public SearchResult searchDecisionRequirementsResults(SearchQuery query) + throws OperateException { + return httpClient.post( + SearchResult.class, + DecisionRequirements.class, + SearchResultTypeToken.searchResultDecisionRequirements, + query); + } + + public List searchIncidents(SearchQuery query) throws OperateException { + return searchIncidentResults(query).getItems(); + } + + public SearchResult searchIncidentResults(SearchQuery query) throws OperateException { + return httpClient.post( + SearchResult.class, Incident.class, SearchResultTypeToken.searchResultIncident, query); + } + + public ProcessInstance getProcessInstance(Long key) throws OperateException { + return httpClient.get(ProcessInstance.class, key); + } + + public ChangeStatus deleteProcessInstance(Long key) throws OperateException { + return httpClient.delete(ChangeStatus.class, ProcessInstance.class, key); + } + + public List getFlowNodeStatistics(Long key) throws OperateException { + return httpClient.get( + List.class, FlowNodeStatistics.class, ListTypeToken.listFlowNodeStatistics, key); + } + + public List getSequenceFlows(Long key) throws OperateException { + return httpClient.get(List.class, String.class, ListTypeToken.listSequenceFlows, key); + } + + public FlowNodeInstance getFlowNodeInstance(Long key) throws OperateException { + return httpClient.get(FlowNodeInstance.class, key); + } + + public Incident getIncident(Long key) throws OperateException { + return httpClient.get(Incident.class, key); + } + + public DecisionDefinition getDecisionDefinition(Long key) throws OperateException { + return httpClient.get(DecisionDefinition.class, key); + } + + public DecisionRequirements getDecisionRequirements(Long key) throws OperateException { + return httpClient.get(DecisionRequirements.class, key); + } + + public String getDecisionRequirementsXml(Long key) throws OperateException { + return httpClient.getXml(DecisionRequirements.class, key); + } + + public DecisionInstance getDecisionInstance(String id) throws OperateException { + return httpClient.get(DecisionInstance.class, id); + } + + public Variable getVariable(Long key) throws OperateException { + return httpClient.get(Variable.class, key); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java new file mode 100644 index 0000000..58c44b3 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java @@ -0,0 +1,6 @@ +package io.camunda.operate; + +import io.camunda.operate.auth.Authentication; +import java.net.URL; + +public record CamundaOperateClientConfiguration(Authentication authentication, URL baseUrl) {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java new file mode 100644 index 0000000..f49ae1b --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java @@ -0,0 +1,10 @@ +package io.camunda.operate.auth; + +import java.util.Map; + +public interface Authentication { + + Map.Entry getTokenHeader(); + + void resetToken(); +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java new file mode 100644 index 0000000..34dc184 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java @@ -0,0 +1,33 @@ +package io.camunda.operate.auth; + +import io.camunda.operate.exception.SdkException; +import java.lang.invoke.MethodHandles; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Default implementation for Authentication Typically you will replace this by a proper + * authentication by setting the right properties + */ +public class DefaultNoopAuthentication implements Authentication { + + private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private final String errorMessage = + "Unable to determine authentication. Please check your configuration"; + + public DefaultNoopAuthentication() { + LOG.error(errorMessage); + } + + @Override + public void resetToken() { + throw new SdkException(errorMessage); + } + + @Override + public Map.Entry getTokenHeader() { + throw new UnsupportedOperationException("Unable to determine authentication"); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java new file mode 100644 index 0000000..59219ed --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java @@ -0,0 +1,81 @@ +package io.camunda.operate.auth; + +import io.camunda.common.json.JsonMapper; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.io.entity.EntityUtils; +import org.apache.hc.core5.http.message.BasicNameValuePair; + +public class JwtAuthentication implements Authentication { + private final JwtCredential jwtCredential; + private final JsonMapper jsonMapper; + private String token; + private LocalDateTime timeout; + + public JwtAuthentication(JwtCredential jwtCredential, JsonMapper jsonMapper) { + this.jwtCredential = jwtCredential; + this.jsonMapper = jsonMapper; + } + + @Override + public Entry getTokenHeader() { + if (token == null || timeout == null || timeout.isBefore(LocalDateTime.now())) { + TokenResponse response = retrieveToken(); + token = response.getAccessToken(); + timeout = LocalDateTime.now().plusSeconds(response.getExpiresIn()).minusSeconds(30); + } + return Map.entry("Authorization", "Bearer " + token); + } + + @Override + public void resetToken() { + this.token = null; + this.timeout = null; + } + + private TokenResponse retrieveToken() { + try (CloseableHttpClient client = HttpClients.createDefault()) { + HttpPost request = buildRequest(); + return client.execute( + request, + response -> { + try { + return jsonMapper.fromJson( + EntityUtils.toString(response.getEntity()), TokenResponse.class); + } catch (Exception e) { + var errorMessage = + String.format( + """ + Token retrieval failed from: %s + Response code: %s + Audience: %s + """, + jwtCredential.authUrl(), response.getCode(), jwtCredential.audience()); + throw new RuntimeException(errorMessage, e); + } + }); + } catch (Exception e) { + throw new RuntimeException("Authenticating for Operate failed due to " + e.getMessage(), e); + } + } + + private HttpPost buildRequest() { + HttpPost httpPost = new HttpPost(jwtCredential.authUrl()); + httpPost.addHeader("Content-Type", "application/json"); + List formParams = new ArrayList<>(); + formParams.add(new BasicNameValuePair("grant_type", "client_credentials")); + formParams.add(new BasicNameValuePair("client_id", jwtCredential.clientId())); + formParams.add(new BasicNameValuePair("client_secret", jwtCredential.clientSecret())); + formParams.add(new BasicNameValuePair("audience", jwtCredential.audience())); + httpPost.setEntity(new UrlEncodedFormEntity(formParams)); + return httpPost; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java new file mode 100644 index 0000000..616318c --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java @@ -0,0 +1,4 @@ +package io.camunda.operate.auth; + +public record JwtCredential( + String clientId, String clientSecret, String audience, String authUrl) {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java new file mode 100644 index 0000000..56fe10f --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java @@ -0,0 +1,80 @@ +package io.camunda.operate.auth; + +import java.lang.invoke.MethodHandles; +import java.time.LocalDateTime; +import java.util.*; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.message.BasicNameValuePair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SimpleAuthentication implements Authentication { + + private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private final SimpleCredential simpleCredential; + private String token; + private LocalDateTime sessionTimeout; + + public SimpleAuthentication(SimpleCredential simpleCredential) { + this.simpleCredential = simpleCredential; + } + + private String retrieveToken() { + try (CloseableHttpClient client = HttpClients.createDefault()) { + HttpPost request = buildRequest(simpleCredential); + String cookie = + client.execute( + request, + response -> { + Header[] cookieHeaders = response.getHeaders("Set-Cookie"); + String cookieCandidate = null; + String cookiePrefix = "OPERATE-SESSION"; + for (Header cookieHeader : cookieHeaders) { + if (cookieHeader.getValue().startsWith(cookiePrefix)) { + cookieCandidate = cookieHeader.getValue(); + break; + } + } + return cookieCandidate; + }); + if (cookie == null) { + throw new RuntimeException("Unable to authenticate due to missing Set-Cookie"); + } + token = cookie; + sessionTimeout = LocalDateTime.now().plus(simpleCredential.sessionTimeout()); + } catch (Exception e) { + LOG.error("Authenticating for Operate failed due to " + e); + throw new RuntimeException("Unable to authenticate", e); + } + return token; + } + + private HttpPost buildRequest(SimpleCredential simpleCredential) { + HttpPost httpPost = new HttpPost(simpleCredential.baseUrl().toString() + "/api/login"); + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("username", simpleCredential.username())); + params.add(new BasicNameValuePair("password", simpleCredential.password())); + httpPost.setEntity(new UrlEncodedFormEntity(params)); + return httpPost; + } + + @Override + public Map.Entry getTokenHeader() { + if (token == null) { + token = retrieveToken(); + } + + return new AbstractMap.SimpleEntry<>("Cookie", token); + } + + @Override + public void resetToken() { + token = null; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleCredential.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleCredential.java new file mode 100644 index 0000000..14c5878 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleCredential.java @@ -0,0 +1,8 @@ +package io.camunda.operate.auth; + +import java.net.URL; +import java.time.Duration; + +/** Contains credential for particular product. Used for Simple authentication. */ +public record SimpleCredential( + String username, String password, URL baseUrl, Duration sessionTimeout) {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponse.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponse.java new file mode 100644 index 0000000..a9986b9 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponse.java @@ -0,0 +1,51 @@ +package io.camunda.operate.auth; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TokenResponse { + + @JsonProperty("access_token") + private String accessToken; + + private String scope; + + @JsonProperty("expires_in") + private Integer expiresIn; + + @JsonProperty("token_type") + private String tokenType; + + TokenResponse() {} + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + + public String getScope() { + return scope; + } + + public void setScope(String scope) { + this.scope = scope; + } + + public Integer getExpiresIn() { + return expiresIn; + } + + public void setExpiresIn(Integer expiresIn) { + this.expiresIn = expiresIn; + } + + public String getTokenType() { + return tokenType; + } + + public void setTokenType(String tokenType) { + this.tokenType = tokenType; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/exception/OperateException.java b/extension/java-client-operate/src/main/java/io/camunda/operate/exception/OperateException.java new file mode 100644 index 0000000..2116067 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/exception/OperateException.java @@ -0,0 +1,20 @@ +package io.camunda.operate.exception; + +public class OperateException extends Exception { + + public OperateException() { + super(); + } + + public OperateException(Exception e) { + super(e); + } + + public OperateException(String message) { + super(message); + } + + public OperateException(String message, Exception e) { + super(message, e); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/exception/SdkException.java b/extension/java-client-operate/src/main/java/io/camunda/operate/exception/SdkException.java new file mode 100644 index 0000000..c7ab65a --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/exception/SdkException.java @@ -0,0 +1,18 @@ +package io.camunda.operate.exception; + +public class SdkException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public SdkException(final Throwable cause) { + super(cause); + } + + public SdkException(final String message) { + super(message); + } + + public SdkException(final String message, final Throwable cause) { + super(message, cause); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java new file mode 100644 index 0000000..6ec443a --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java @@ -0,0 +1,275 @@ +package io.camunda.operate.http; + +import com.google.common.reflect.TypeToken; +import io.camunda.common.exception.SdkException; +import io.camunda.common.json.JsonMapper; +import io.camunda.common.json.SdkObjectMapper; +import io.camunda.operate.auth.Authentication; +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.hc.core5.http.io.entity.EntityUtils; +import org.apache.hc.core5.http.io.entity.StringEntity; +import org.apache.hc.core5.http.message.BasicHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Default Http Client powered by Apache HttpClient */ +public class DefaultHttpClient implements HttpClient { + + private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private final Map, String> endpointMap; + private final CloseableHttpClient httpClient; + private final Authentication authentication; + private final JsonMapper jsonMapper; + private String host = ""; + private String basePath = ""; + + public DefaultHttpClient(Authentication authentication) { + this.authentication = authentication; + this.httpClient = HttpClients.createDefault(); + this.jsonMapper = new SdkObjectMapper(); + this.endpointMap = new HashMap<>(); + } + + public DefaultHttpClient( + Authentication authentication, + CloseableHttpClient httpClient, + JsonMapper jsonMapper, + Map, String> endpointMap) { + this.authentication = authentication; + this.httpClient = httpClient; + this.jsonMapper = jsonMapper; + this.endpointMap = endpointMap; + } + + @Override + public void init(String host, String basePath) { + this.host = host; + this.basePath = basePath; + } + + @Override + public void loadMap(Map, String> map) { + this.endpointMap.putAll(map); + } + + @Override + public T get(Class responseType, Long key) { + return get(responseType, String.valueOf(key)); + } + + @Override + public T get(Class responseType, String id) { + String url = host + basePath + retrievePath(responseType) + "/" + id; + HttpGet httpGet = new HttpGet(url); + httpGet.addHeader(retrieveToken(responseType)); + T resp; + try (CloseableHttpResponse response = httpClient.execute(httpGet)) { + resp = parseAndRetry(response, responseType); + } catch (Exception e) { + LOG.error( + "Failed GET with responseType {}, id {} due to {}", responseType, id, e.getMessage()); + throw new SdkException(e); + } + + return resp; + } + + @Override + public T get( + Class responseType, Class parameterType, TypeToken selector, Long key) { + return get(responseType, parameterType, selector, String.valueOf(key)); + } + + private T get( + Class responseType, Class parameterType, TypeToken selector, String id) { + String resourcePath = retrievePath(selector.getClass()); + if (resourcePath.contains("{key}")) { + resourcePath = resourcePath.replace("{key}", String.valueOf(id)); + } else { + resourcePath = resourcePath + "/" + id; + } + String url = host + basePath + resourcePath; + HttpGet httpGet = new HttpGet(url); + httpGet.addHeader(retrieveToken(selector.getClass())); + T resp; + try (CloseableHttpResponse response = httpClient.execute(httpGet)) { + resp = parseAndRetry(response, responseType, parameterType, selector); + } catch (Exception e) { + LOG.error( + "Failed GET with responseType {}, parameterType {}, selector {}, id {} due to {}", + responseType, + parameterType, + selector, + id, + e.getMessage()); + throw new SdkException(e); + } + return resp; + } + + @Override + public String getXml(Class selector, Long key) { + String url = host + basePath + retrievePath(selector) + "/" + key + "/xml"; + HttpGet httpGet = new HttpGet(url); + httpGet.addHeader(retrieveToken(selector)); + String xml; + try (CloseableHttpResponse response = httpClient.execute(httpGet)) { + xml = parseXMLAndRetry(response, selector); + } catch (Exception e) { + LOG.error("Failed GET with selector {}, key {} due to {}", selector, key, e.getMessage()); + throw new SdkException(e); + } + return xml; + } + + @Override + public T post( + Class responseType, Class parameterType, TypeToken selector, U body) { + String url = host + basePath + retrievePath(selector.getClass()); + HttpPost httpPost = new HttpPost(url); + httpPost.addHeader("Content-Type", "application/json"); + httpPost.addHeader(retrieveToken(selector.getClass())); + T resp; + String data = jsonMapper.toJson(body); + httpPost.setEntity(new StringEntity(data)); + try (CloseableHttpResponse response = httpClient.execute(httpPost)) { + resp = parseAndRetry(response, responseType, parameterType, selector); + } catch (Exception e) { + LOG.error( + "Failed POST with responseType {}, parameterType {}, selector {}, body {} due to {}", + responseType, + parameterType, + selector, + body, + e.getMessage()); + throw new SdkException(e); + } + return resp; + } + + @Override + public T delete(Class responseType, Class selector, Long key) { + String resourcePath = retrievePath(selector) + "/" + key; + String url = host + basePath + resourcePath; + HttpDelete httpDelete = new HttpDelete(url); + httpDelete.addHeader(retrieveToken(selector)); + T resp = null; + try (CloseableHttpResponse response = httpClient.execute(httpDelete)) { + resp = parseAndRetry(response, responseType, selector); + } catch (Exception e) { + LOG.error( + "Failed DELETE with responseType {}, selector {}, key {}, due to {}", + responseType, + selector, + key, + e.getMessage()); + throw new SdkException(e); + } + return resp; + } + + private String retrievePath(Class clazz) { + AtomicReference path = new AtomicReference<>(); + if (endpointMap.containsKey(clazz)) { + path.set(endpointMap.get(clazz)); + } + return path.get(); + } + + private Header retrieveToken(Class clazz) { + Map.Entry header = authentication.getTokenHeader(); + return new BasicHeader(header.getKey(), header.getValue()); + } + + // TODO: Refactor duplicate code parseAndRetry() + + private String parseXMLAndRetry(CloseableHttpResponse response, Class selector) + throws IOException { + String resp; + if (200 <= response.getCode() && response.getCode() <= 299) { + resp = + new String( + Java8Utils.readAllBytes(response.getEntity().getContent()), StandardCharsets.UTF_8); + } else { + if (response.getCode() == HttpStatus.SC_UNAUTHORIZED + || response.getCode() == HttpStatus.SC_FORBIDDEN) { + authentication.resetToken(); + } + throw new SdkException("Response not successful: " + response.getCode()); + } + return resp; + } + + private T parseAndRetry(CloseableHttpResponse response, Class responseType) + throws IOException { + T resp; + if (200 <= response.getCode() && response.getCode() <= 299) { + HttpEntity entity = response.getEntity(); + String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); + resp = jsonMapper.fromJson(tmp, responseType); + EntityUtils.consume(entity); + } else { + if (response.getCode() == HttpStatus.SC_UNAUTHORIZED + || response.getCode() == HttpStatus.SC_FORBIDDEN) { + authentication.resetToken(); + // TODO: Add capability to auto retry the existing request + } + throw new SdkException("Response not successful: " + response.getCode()); + } + return resp; + } + + private T parseAndRetry( + CloseableHttpResponse response, Class responseType, Class selector) throws IOException { + T resp; + if (200 <= response.getCode() && response.getCode() <= 299) { + HttpEntity entity = response.getEntity(); + String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); + resp = jsonMapper.fromJson(tmp, responseType); + EntityUtils.consume(entity); + } else { + if (response.getCode() == HttpStatus.SC_UNAUTHORIZED + || response.getCode() == HttpStatus.SC_FORBIDDEN) { + authentication.resetToken(); + } + throw new SdkException("Response not successful: " + response.getCode()); + } + return resp; + } + + private T parseAndRetry( + CloseableHttpResponse response, + Class responseType, + Class parameterType, + TypeToken selector) + throws IOException { + T resp; + if (200 <= response.getCode() && response.getCode() <= 299) { + HttpEntity entity = response.getEntity(); + String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); + resp = jsonMapper.fromJson(tmp, responseType, parameterType); + EntityUtils.consume(entity); + } else { + if (response.getCode() == HttpStatus.SC_UNAUTHORIZED + || response.getCode() == HttpStatus.SC_FORBIDDEN) { + authentication.resetToken(); + } + throw new SdkException("Response not successful: " + response.getCode()); + } + return resp; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java new file mode 100644 index 0000000..6e0979b --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java @@ -0,0 +1,24 @@ +package io.camunda.operate.http; + +import com.google.common.reflect.TypeToken; +import java.util.Map; + +/** Interface to enable swappable http client implementations */ +public interface HttpClient { + + void init(String host, String basePath); + + void loadMap(Map, String> map); + + T get(Class responseType, Long key); + + T get(Class responseType, String id); + + T get(Class responseType, Class parameterType, TypeToken selector, Long key); + + String getXml(Class selector, Long key); + + T post(Class responseType, Class parameterType, TypeToken selector, U body); + + T delete(Class responseType, Class selector, Long key); +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/Java8Utils.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/Java8Utils.java new file mode 100644 index 0000000..074065b --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/Java8Utils.java @@ -0,0 +1,37 @@ +package io.camunda.operate.http; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + +public class Java8Utils { + + private Java8Utils() {} + + public static byte[] readAllBytes(InputStream inputStream) throws IOException { + final int bufLen = 4 * 0x400; // 4KB + byte[] buf = new byte[bufLen]; + int readLen; + IOException exception = null; + + try { + try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { + while ((readLen = inputStream.read(buf, 0, bufLen)) != -1) + outputStream.write(buf, 0, readLen); + + return outputStream.toByteArray(); + } + } catch (IOException e) { + exception = e; + throw e; + } finally { + if (exception == null) inputStream.close(); + else + try { + inputStream.close(); + } catch (IOException e) { + exception.addSuppressed(e); + } + } + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ChangeStatus.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ChangeStatus.java new file mode 100644 index 0000000..53a514c --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ChangeStatus.java @@ -0,0 +1,23 @@ +package io.camunda.operate.model; + +public class ChangeStatus { + + private String message; + private Long deleted; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Long getDeleted() { + return deleted; + } + + public void setDeleted(Long deleted) { + this.deleted = deleted; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionDefinition.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionDefinition.java new file mode 100644 index 0000000..2eeb670 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionDefinition.java @@ -0,0 +1,95 @@ +package io.camunda.operate.model; + +public class DecisionDefinition { + + private String id; + private Long key; + private String decisionId; + private String name; + private Long version; + private String decisionRequirementsId; + private Long decisionRequirementsKey; + private String decisionRequirementsName; + private Long decisionRequirementsVersion; + private String tenantId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public String getDecisionId() { + return decisionId; + } + + public void setDecisionId(String decisionId) { + this.decisionId = decisionId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public String getDecisionRequirementsId() { + return decisionRequirementsId; + } + + public void setDecisionRequirementsId(String decisionRequirementsId) { + this.decisionRequirementsId = decisionRequirementsId; + } + + public Long getDecisionRequirementsKey() { + return decisionRequirementsKey; + } + + public void setDecisionRequirementsKey(Long decisionRequirementsKey) { + this.decisionRequirementsKey = decisionRequirementsKey; + } + + public String getDecisionRequirementsName() { + return decisionRequirementsName; + } + + public void setDecisionRequirementsName(String decisionRequirementsName) { + this.decisionRequirementsName = decisionRequirementsName; + } + + public Long getDecisionRequirementsVersion() { + return decisionRequirementsVersion; + } + + public void setDecisionRequirementsVersion(Long decisionRequirementsVersion) { + this.decisionRequirementsVersion = decisionRequirementsVersion; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstance.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstance.java new file mode 100644 index 0000000..fa3a895 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstance.java @@ -0,0 +1,151 @@ +package io.camunda.operate.model; + +import java.util.List; + +public class DecisionInstance { + + private String id; + private Long key; + private DecisionState state; + private String evaluationDate; + private String evaluationFailure; + private Long processDefinitionKey; + private Long processInstanceKey; + private String decisionId; + private String decisionDefinitionId; + private String decisionName; + private Long decisionVersion; + private DecisionType decisionType; + private String result; + private List evaluatedInputs; + private List evaluatedOutputs; + private String tenantId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public DecisionState getState() { + return state; + } + + public void setState(DecisionState state) { + this.state = state; + } + + public String getEvaluationDate() { + return evaluationDate; + } + + public void setEvaluationDate(String evaluationDate) { + this.evaluationDate = evaluationDate; + } + + public String getEvaluationFailure() { + return evaluationFailure; + } + + public void setEvaluationFailure(String evaluationFailure) { + this.evaluationFailure = evaluationFailure; + } + + public Long getProcessDefinitionKey() { + return processDefinitionKey; + } + + public void setProcessDefinitionKey(Long processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + + public Long getProcessInstanceKey() { + return processInstanceKey; + } + + public void setProcessInstanceKey(Long processInstanceKey) { + this.processInstanceKey = processInstanceKey; + } + + public String getDecisionId() { + return decisionId; + } + + public void setDecisionId(String decisionId) { + this.decisionId = decisionId; + } + + public String getDecisionDefinitionId() { + return decisionDefinitionId; + } + + public void setDecisionDefinitionId(String decisionDefinitionId) { + this.decisionDefinitionId = decisionDefinitionId; + } + + public String getDecisionName() { + return decisionName; + } + + public void setDecisionName(String decisionName) { + this.decisionName = decisionName; + } + + public Long getDecisionVersion() { + return decisionVersion; + } + + public void setDecisionVersion(Long decisionVersion) { + this.decisionVersion = decisionVersion; + } + + public DecisionType getDecisionType() { + return decisionType; + } + + public void setDecisionType(DecisionType decisionType) { + this.decisionType = decisionType; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public List getEvaluatedInputs() { + return evaluatedInputs; + } + + public void setEvaluatedInputs(List evaluatedInputs) { + this.evaluatedInputs = evaluatedInputs; + } + + public List getEvaluatedOutputs() { + return evaluatedOutputs; + } + + public void setEvaluatedOutputs(List evaluatedOutputs) { + this.evaluatedOutputs = evaluatedOutputs; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceInput.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceInput.java new file mode 100644 index 0000000..a5bf5e6 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceInput.java @@ -0,0 +1,32 @@ +package io.camunda.operate.model; + +public class DecisionInstanceInput { + + private String id; + private String name; + private String value; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceOutput.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceOutput.java new file mode 100644 index 0000000..8939bf7 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionInstanceOutput.java @@ -0,0 +1,50 @@ +package io.camunda.operate.model; + +public class DecisionInstanceOutput { + + private String id; + private String name; + private String value; + private String ruleId; + private Long ruleIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getRuleId() { + return ruleId; + } + + public void setRuleId(String ruleId) { + this.ruleId = ruleId; + } + + public Long getRuleIndex() { + return ruleIndex; + } + + public void setRuleIndex(Long ruleIndex) { + this.ruleIndex = ruleIndex; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionRequirements.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionRequirements.java new file mode 100644 index 0000000..b465371 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionRequirements.java @@ -0,0 +1,68 @@ +package io.camunda.operate.model; + +public class DecisionRequirements { + + private String id; + private Long key; + private String decisionRequirements; + private String name; + private Long version; + private String resourceName; + private String tenantId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public String getDecisionRequirements() { + return decisionRequirements; + } + + public void setDecisionRequirements(String decisionRequirements) { + this.decisionRequirements = decisionRequirements; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionState.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionState.java new file mode 100644 index 0000000..695eb59 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionState.java @@ -0,0 +1,8 @@ +package io.camunda.operate.model; + +public enum DecisionState { + FAILED, + EVALUATED, + UNKNOWN, + UNSPECIFIED +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionType.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionType.java new file mode 100644 index 0000000..df755b2 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/DecisionType.java @@ -0,0 +1,8 @@ +package io.camunda.operate.model; + +public enum DecisionType { + DECISION_TABLE, + LITERAL_EXPRESSION, + UNSPECIFIED, + UNKNOWN +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstance.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstance.java new file mode 100644 index 0000000..e3b5f2f --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstance.java @@ -0,0 +1,114 @@ +package io.camunda.operate.model; + +import java.util.Date; + +public class FlowNodeInstance { + private Long key; + private Long processInstanceKey; + private Long processDefinitionKey; + private Date startDate; + private Date endDate; + private String flowNodeId; + private String flowNodeName; + private Long incidentKey; + private String type; + private FlowNodeInstanceState state; + private Boolean incident; + private String tenantId; + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public Long getProcessInstanceKey() { + return processInstanceKey; + } + + public void setProcessInstanceKey(Long processInstanceKey) { + this.processInstanceKey = processInstanceKey; + } + + public Long getProcessDefinitionKey() { + return processDefinitionKey; + } + + public void setProcessDefinitionKey(Long processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public String getFlowNodeId() { + return flowNodeId; + } + + public void setFlowNodeId(String flowNodeId) { + this.flowNodeId = flowNodeId; + } + + public String getFlowNodeName() { + return flowNodeName; + } + + public void setFlowNodeName(String flowNodeName) { + this.flowNodeName = flowNodeName; + } + + public Long getIncidentKey() { + return incidentKey; + } + + public void setIncidentKey(Long incidentKey) { + this.incidentKey = incidentKey; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public FlowNodeInstanceState getState() { + return state; + } + + public void setState(FlowNodeInstanceState state) { + this.state = state; + } + + public Boolean getIncident() { + return incident; + } + + public void setIncident(Boolean incident) { + this.incident = incident; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstanceState.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstanceState.java new file mode 100644 index 0000000..e72de8b --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeInstanceState.java @@ -0,0 +1,8 @@ +package io.camunda.operate.model; + +public enum FlowNodeInstanceState { + ACTIVE, + INCIDENT, + COMPLETED, + TERMINATED; +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeStatistics.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeStatistics.java new file mode 100644 index 0000000..7a89cfb --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/FlowNodeStatistics.java @@ -0,0 +1,50 @@ +package io.camunda.operate.model; + +public class FlowNodeStatistics { + + private String activityId; + private Long active; + private Long canceled; + private Long incidents; + private Long completed; + + public String getActivityId() { + return activityId; + } + + public void setActivityId(String activityId) { + this.activityId = activityId; + } + + public Long getActive() { + return active; + } + + public void setActive(Long active) { + this.active = active; + } + + public Long getCanceled() { + return canceled; + } + + public void setCanceled(Long canceled) { + this.canceled = canceled; + } + + public Long getIncidents() { + return incidents; + } + + public void setIncidents(Long incidents) { + this.incidents = incidents; + } + + public Long getCompleted() { + return completed; + } + + public void setCompleted(Long completed) { + this.completed = completed; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/Incident.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/Incident.java new file mode 100644 index 0000000..4ab7ee2 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/Incident.java @@ -0,0 +1,78 @@ +package io.camunda.operate.model; + +import java.util.Date; + +public class Incident { + private Long key; + private Long processDefinitionKey; + private Long processInstanceKey; + private String type; + private String message; + private Date creationTime; + private String state; + private String tenantId; + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public Long getProcessDefinitionKey() { + return processDefinitionKey; + } + + public void setProcessDefinitionKey(Long processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + + public Long getProcessInstanceKey() { + return processInstanceKey; + } + + public void setProcessInstanceKey(Long processInstanceKey) { + this.processInstanceKey = processInstanceKey; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java new file mode 100644 index 0000000..d0fc088 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java @@ -0,0 +1,11 @@ +package io.camunda.operate.model; + +import com.google.common.reflect.TypeToken; +import java.util.List; + +// See https://github.com/google/guava/wiki/ReflectionExplained +public class ListTypeToken { + public static TypeToken> listFlowNodeStatistics = + new TypeToken>() {}; + public static TypeToken> listSequenceFlows = new TypeToken>() {}; +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessDefinition.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessDefinition.java new file mode 100644 index 0000000..00f264f --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessDefinition.java @@ -0,0 +1,49 @@ +package io.camunda.operate.model; + +public class ProcessDefinition { + private Long key; + private String name; + private Long version; + private String bpmnProcessId; + private String tenantId; + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public String getBpmnProcessId() { + return bpmnProcessId; + } + + public void setBpmnProcessId(String bpmnProcessId) { + this.bpmnProcessId = bpmnProcessId; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java new file mode 100644 index 0000000..935761f --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java @@ -0,0 +1,87 @@ +package io.camunda.operate.model; + +import java.util.Date; + +public class ProcessInstance { + private Long key; + private Long processVersion; + private String bpmnProcessId; + private Long parentKey; + private Date startDate; + private Date endDate; + private ProcessInstanceState state; + private Long processDefinitionKey; + private String tenantId; + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public Long getProcessVersion() { + return processVersion; + } + + public void setProcessVersion(Long processVersion) { + this.processVersion = processVersion; + } + + public String getBpmnProcessId() { + return bpmnProcessId; + } + + public void setBpmnProcessId(String bpmnProcessId) { + this.bpmnProcessId = bpmnProcessId; + } + + public Long getParentKey() { + return parentKey; + } + + public void setParentKey(Long parentKey) { + this.parentKey = parentKey; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public ProcessInstanceState getState() { + return state; + } + + public void setState(ProcessInstanceState state) { + this.state = state; + } + + public Long getProcessDefinitionKey() { + return processDefinitionKey; + } + + public void setProcessDefinitionKey(Long processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstanceState.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstanceState.java new file mode 100644 index 0000000..c93f267 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstanceState.java @@ -0,0 +1,7 @@ +package io.camunda.operate.model; + +public enum ProcessInstanceState { + ACTIVE, + COMPLETED, + CANCELED; +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResult.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResult.java new file mode 100644 index 0000000..e809671 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResult.java @@ -0,0 +1,40 @@ +package io.camunda.operate.model; + +import java.util.Iterator; +import java.util.List; + +public class SearchResult implements Iterable { + private List items; + + private Integer total; + + private List sortValues; + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public List getSortValues() { + return sortValues; + } + + public void setSortValues(List sortValues) { + this.sortValues = sortValues; + } + + public Iterator iterator() { + return this.items.iterator(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java new file mode 100644 index 0000000..821fade --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java @@ -0,0 +1,24 @@ +package io.camunda.operate.model; + +import com.google.common.reflect.TypeToken; + +// See https://github.com/google/guava/wiki/ReflectionExplained +public class SearchResultTypeToken { + + public static TypeToken> searchResultProcessDefinition = + new TypeToken>() {}; + public static TypeToken> searchResultDecisionDefinition = + new TypeToken>() {}; + public static TypeToken> searchResultDecisionInstance = + new TypeToken>() {}; + public static TypeToken> searchResultFlowNodeInstance = + new TypeToken>() {}; + public static TypeToken> searchResultVariable = + new TypeToken>() {}; + public static TypeToken> searchResultProcessInstance = + new TypeToken>() {}; + public static TypeToken> searchResultDecisionRequirements = + new TypeToken>() {}; + public static TypeToken> searchResultIncident = + new TypeToken>() {}; +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/Variable.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/Variable.java new file mode 100644 index 0000000..b791db9 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/Variable.java @@ -0,0 +1,73 @@ +package io.camunda.operate.model; + +public class Variable { + private Long key; + + private Long processInstanceKey; + + private Long scopeKey; + + private String name; + + private String value; + + private Boolean truncated; + + private String tenantId; + + public Long getKey() { + return key; + } + + public void setKey(Long key) { + this.key = key; + } + + public Long getProcessInstanceKey() { + return processInstanceKey; + } + + public void setProcessInstanceKey(Long processInstanceKey) { + this.processInstanceKey = processInstanceKey; + } + + public Long getScopeKey() { + return scopeKey; + } + + public void setScopeKey(Long scopeKey) { + this.scopeKey = scopeKey; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Boolean getTruncated() { + return truncated; + } + + public void setTruncated(Boolean truncated) { + this.truncated = truncated; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilter.java new file mode 100644 index 0000000..7b951f3 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilter.java @@ -0,0 +1,42 @@ +package io.camunda.operate.search; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.Date; + +@JsonSerialize(using = DateFilterSerializer.class) +public class DateFilter { + + private Date date; + + private DateFilterRange range; + + public DateFilter(Date date, DateFilterRange range) { + super(); + this.date = date; + this.range = range; + } + + public DateFilter(Date date) { + this(date, DateFilterRange.SECOND); + } + + public DateFilter() { + this(new Date()); + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public DateFilterRange getRange() { + return range; + } + + public void setRange(DateFilterRange range) { + this.range = range; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterRange.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterRange.java new file mode 100644 index 0000000..562fcbd --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterRange.java @@ -0,0 +1,21 @@ +package io.camunda.operate.search; + +public enum DateFilterRange { + YEAR("y"), + MONTH("M"), + WEEK("w"), + DAY("d"), + HOUR("h"), + MINUTE("m"), + SECOND("s"); + + private String value; + + DateFilterRange(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterSerializer.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterSerializer.java new file mode 100644 index 0000000..1c93242 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DateFilterSerializer.java @@ -0,0 +1,27 @@ +package io.camunda.operate.search; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import java.io.IOException; +import java.text.SimpleDateFormat; + +public class DateFilterSerializer extends StdSerializer { + + public static SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ"); + + /** serial version uid */ + private static final long serialVersionUID = -8106244922585465120L; + + public DateFilterSerializer() { + super(DateFilter.class); + } + + @Override + public void serialize(DateFilter value, JsonGenerator jgen, SerializerProvider provider) + throws IOException, JsonProcessingException { + + jgen.writeString(isoFormat.format(value.getDate()) + "||/" + value.getRange().getValue()); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilter.java new file mode 100644 index 0000000..925d798 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.DecisionDefinition; + +public class DecisionDefinitionFilter extends DecisionDefinition implements Filter { + + public static DecisionDefinitionFilterBuilder builder() { + return new DecisionDefinitionFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilterBuilder.java new file mode 100644 index 0000000..ff911a5 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionDefinitionFilterBuilder.java @@ -0,0 +1,65 @@ +package io.camunda.operate.search; + +public class DecisionDefinitionFilterBuilder { + + DecisionDefinitionFilter filter; + + DecisionDefinitionFilterBuilder() { + filter = new DecisionDefinitionFilter(); + } + + public DecisionDefinitionFilterBuilder id(String id) { + filter.setId(id); + return this; + } + + public DecisionDefinitionFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public DecisionDefinitionFilterBuilder decisionId(String decisionId) { + filter.setDecisionId(decisionId); + return this; + } + + public DecisionDefinitionFilterBuilder name(String name) { + filter.setName(name); + return this; + } + + public DecisionDefinitionFilterBuilder version(Long version) { + filter.setVersion(version); + return this; + } + + public DecisionDefinitionFilterBuilder decisionRequirementsId(String decisionRequirementsId) { + filter.setDecisionRequirementsId(decisionRequirementsId); + return this; + } + + public DecisionDefinitionFilterBuilder decisionRequirementsKey(Long decisionRequirementsKey) { + filter.setDecisionRequirementsKey(decisionRequirementsKey); + return this; + } + + public DecisionDefinitionFilterBuilder decisionRequirementsName(String decisionRequirementsName) { + filter.setDecisionRequirementsName(decisionRequirementsName); + return this; + } + + public DecisionDefinitionFilterBuilder decisionRequirementsVersion( + Long decisionRequirementsVersion) { + filter.setDecisionRequirementsVersion(decisionRequirementsVersion); + return this; + } + + public DecisionDefinitionFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public DecisionDefinitionFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilter.java new file mode 100644 index 0000000..e10e180 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.DecisionInstance; + +public class DecisionInstanceFilter extends DecisionInstance implements Filter { + + public static DecisionInstanceFilterBuilder builder() { + return new DecisionInstanceFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilterBuilder.java new file mode 100644 index 0000000..40ff7c2 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionInstanceFilterBuilder.java @@ -0,0 +1,102 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.DecisionInstanceInput; +import io.camunda.operate.model.DecisionInstanceOutput; +import io.camunda.operate.model.DecisionState; +import io.camunda.operate.model.DecisionType; +import java.util.List; + +public class DecisionInstanceFilterBuilder { + + DecisionInstanceFilter filter; + + DecisionInstanceFilterBuilder() { + filter = new DecisionInstanceFilter(); + } + + public DecisionInstanceFilterBuilder id(String id) { + filter.setId(id); + return this; + } + + public DecisionInstanceFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public DecisionInstanceFilterBuilder state(DecisionState state) { + filter.setState(state); + return this; + } + + public DecisionInstanceFilterBuilder evaluationDate(String evaluationDate) { + filter.setEvaluationDate(evaluationDate); + return this; + } + + public DecisionInstanceFilterBuilder evaluationFailure(String evaluationFailure) { + filter.setEvaluationFailure(evaluationFailure); + return this; + } + + public DecisionInstanceFilterBuilder processDefinitionKey(Long processDefinitionKey) { + filter.setProcessDefinitionKey(processDefinitionKey); + return this; + } + + public DecisionInstanceFilterBuilder processInstanceKey(Long processInstanceKey) { + filter.setProcessInstanceKey(processInstanceKey); + return this; + } + + public DecisionInstanceFilterBuilder decisionId(String decisionId) { + filter.setDecisionId(decisionId); + return this; + } + + public DecisionInstanceFilterBuilder decisionDefinitionId(String decisionDefinitionId) { + filter.setDecisionDefinitionId(decisionDefinitionId); + return this; + } + + public DecisionInstanceFilterBuilder decisionName(String decisionName) { + filter.setDecisionName(decisionName); + return this; + } + + public DecisionInstanceFilterBuilder decisionVersion(Long decisionVersion) { + filter.setDecisionVersion(decisionVersion); + return this; + } + + public DecisionInstanceFilterBuilder decisionType(DecisionType decisionType) { + filter.setDecisionType(decisionType); + return this; + } + + public DecisionInstanceFilterBuilder result(String result) { + filter.setResult(result); + return this; + } + + public DecisionInstanceFilterBuilder evaluatedInputs( + List evaluatedInputs) { + filter.setEvaluatedInputs(evaluatedInputs); + return this; + } + + public DecisionInstanceFilterBuilder evaluatedOutputs( + List evaluatedOutputs) { + filter.setEvaluatedOutputs(evaluatedOutputs); + return this; + } + + public DecisionInstanceFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public DecisionInstanceFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilter.java new file mode 100644 index 0000000..b8989d4 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.DecisionRequirements; + +public class DecisionRequirementsFilter extends DecisionRequirements implements Filter { + + public static DecisionRequirementsFilterBuilder builder() { + return new DecisionRequirementsFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilterBuilder.java new file mode 100644 index 0000000..b8a239a --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/DecisionRequirementsFilterBuilder.java @@ -0,0 +1,49 @@ +package io.camunda.operate.search; + +public class DecisionRequirementsFilterBuilder { + + DecisionRequirementsFilter filter; + + DecisionRequirementsFilterBuilder() { + filter = new DecisionRequirementsFilter(); + } + + public DecisionRequirementsFilterBuilder id(String id) { + filter.setId(id); + return this; + } + + public DecisionRequirementsFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public DecisionRequirementsFilterBuilder decisionRequirements(String decisionRequirements) { + filter.setDecisionRequirements(decisionRequirements); + return this; + } + + public DecisionRequirementsFilterBuilder name(String name) { + filter.setName(name); + return this; + } + + public DecisionRequirementsFilterBuilder version(Long version) { + filter.setVersion(version); + return this; + } + + public DecisionRequirementsFilterBuilder resourceName(String resourceName) { + filter.setResourceName(resourceName); + return this; + } + + public DecisionRequirementsFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public DecisionRequirementsFilter build() { + return filter; + } +} diff --git a/src/main/java/io/camunda/operate/search/Filter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/Filter.java similarity index 55% rename from src/main/java/io/camunda/operate/search/Filter.java rename to extension/java-client-operate/src/main/java/io/camunda/operate/search/Filter.java index bb76fd6..e6d5a81 100644 --- a/src/main/java/io/camunda/operate/search/Filter.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/Filter.java @@ -1,5 +1,3 @@ package io.camunda.operate.search; -public interface Filter { - -} +public interface Filter {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilter.java new file mode 100644 index 0000000..5534b0b --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.FlowNodeInstance; + +public class FlowNodeInstanceFilter extends FlowNodeInstance implements Filter { + + public static FlowNodeInstanceFilterBuilder builder() { + return new FlowNodeInstanceFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilterBuilder.java new file mode 100644 index 0000000..d3982ee --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/FlowNodeInstanceFilterBuilder.java @@ -0,0 +1,77 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.FlowNodeInstanceState; +import java.util.Date; + +public class FlowNodeInstanceFilterBuilder { + + FlowNodeInstanceFilter filter; + + FlowNodeInstanceFilterBuilder() { + filter = new FlowNodeInstanceFilter(); + } + + public FlowNodeInstanceFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public FlowNodeInstanceFilterBuilder processInstanceKey(Long processInstanceKey) { + filter.setProcessInstanceKey(processInstanceKey); + return this; + } + + public FlowNodeInstanceFilterBuilder processDefinitionKey(Long processDefinitionKey) { + filter.setProcessDefinitionKey(processDefinitionKey); + return this; + } + + public FlowNodeInstanceFilterBuilder startDate(Date startDate) { + filter.setStartDate(startDate); + return this; + } + + public FlowNodeInstanceFilterBuilder endDate(Date endDate) { + filter.setEndDate(endDate); + return this; + } + + public FlowNodeInstanceFilterBuilder flowNodeId(String flowNodeId) { + filter.setFlowNodeId(flowNodeId); + return this; + } + + public FlowNodeInstanceFilterBuilder flowNodeName(String flowNodeName) { + filter.setFlowNodeName(flowNodeName); + return this; + } + + public FlowNodeInstanceFilterBuilder incidentKey(Long incidentKey) { + filter.setIncidentKey(incidentKey); + return this; + } + + public FlowNodeInstanceFilterBuilder type(String type) { + filter.setType(type); + return this; + } + + public FlowNodeInstanceFilterBuilder state(FlowNodeInstanceState state) { + filter.setState(state); + return this; + } + + public FlowNodeInstanceFilterBuilder incident(Boolean incident) { + filter.setIncident(incident); + return this; + } + + public FlowNodeInstanceFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public FlowNodeInstanceFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilter.java new file mode 100644 index 0000000..e80b6a7 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.Incident; + +public class IncidentFilter extends Incident implements Filter { + + public static IncidentFilterBuilder builder() { + return new IncidentFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilterBuilder.java new file mode 100644 index 0000000..ae5101f --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/IncidentFilterBuilder.java @@ -0,0 +1,56 @@ +package io.camunda.operate.search; + +import java.util.Date; + +public class IncidentFilterBuilder { + + IncidentFilter filter; + + IncidentFilterBuilder() { + filter = new IncidentFilter(); + } + + public IncidentFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public IncidentFilterBuilder processDefinitionKey(Long processDefinitionKey) { + filter.setProcessDefinitionKey(processDefinitionKey); + return this; + } + + public IncidentFilterBuilder processInstanceKey(Long processInstanceKey) { + filter.setProcessInstanceKey(processInstanceKey); + return this; + } + + public IncidentFilterBuilder type(String type) { + filter.setType(type); + return this; + } + + public IncidentFilterBuilder message(String message) { + filter.setMessage(message); + return this; + } + + public IncidentFilterBuilder creationTime(Date creationTime) { + filter.setCreationTime(creationTime); + return this; + } + + public IncidentFilterBuilder state(String state) { + filter.setState(state); + return this; + } + + public IncidentFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public IncidentFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java new file mode 100644 index 0000000..6c09a0c --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.ProcessDefinition; + +public class ProcessDefinitionFilter extends ProcessDefinition implements Filter { + + public static ProcessDefinitionFilterBuilder builder() { + return new ProcessDefinitionFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilterBuilder.java new file mode 100644 index 0000000..be3e3ee --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessDefinitionFilterBuilder.java @@ -0,0 +1,39 @@ +package io.camunda.operate.search; + +public class ProcessDefinitionFilterBuilder { + + ProcessDefinitionFilter filter; + + ProcessDefinitionFilterBuilder() { + filter = new ProcessDefinitionFilter(); + } + + public ProcessDefinitionFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public ProcessDefinitionFilterBuilder name(String name) { + filter.setName(name); + return this; + } + + public ProcessDefinitionFilterBuilder version(Long version) { + filter.setVersion(version); + return this; + } + + public ProcessDefinitionFilterBuilder bpmnProcessId(String bpmnProcessId) { + filter.setBpmnProcessId(bpmnProcessId); + return this; + } + + public ProcessDefinitionFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public ProcessDefinitionFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java new file mode 100644 index 0000000..cfe5c5e --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.ProcessInstance; + +public class ProcessInstanceFilter extends ProcessInstance implements Filter { + + public static ProcessInstanceFilterBuilder builder() { + return new ProcessInstanceFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilterBuilder.java new file mode 100644 index 0000000..0fc2d09 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/ProcessInstanceFilterBuilder.java @@ -0,0 +1,62 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.ProcessInstanceState; +import java.util.Date; + +public class ProcessInstanceFilterBuilder { + + ProcessInstanceFilter filter; + + ProcessInstanceFilterBuilder() { + filter = new ProcessInstanceFilter(); + } + + public ProcessInstanceFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public ProcessInstanceFilterBuilder processVersion(Long processVersion) { + filter.setProcessVersion(processVersion); + return this; + } + + public ProcessInstanceFilterBuilder bpmnProcessId(String bpmnProcessId) { + filter.setBpmnProcessId(bpmnProcessId); + return this; + } + + public ProcessInstanceFilterBuilder parentKey(Long parentKey) { + filter.setParentKey(parentKey); + return this; + } + + public ProcessInstanceFilterBuilder startDate(Date startDate) { + filter.setStartDate(startDate); + return this; + } + + public ProcessInstanceFilterBuilder endDate(Date endDate) { + filter.setEndDate(endDate); + return this; + } + + public ProcessInstanceFilterBuilder state(ProcessInstanceState state) { + filter.setState(state); + return this; + } + + public ProcessInstanceFilterBuilder processDefinitionKey(Long processDefinitionKey) { + filter.setProcessDefinitionKey(processDefinitionKey); + return this; + } + + public ProcessInstanceFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public ProcessInstanceFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/SearchQuery.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/SearchQuery.java new file mode 100644 index 0000000..6f3fcb0 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/SearchQuery.java @@ -0,0 +1,103 @@ +package io.camunda.operate.search; + +import io.camunda.operate.exception.OperateException; +import java.util.ArrayList; +import java.util.List; + +public class SearchQuery { + private Filter filter; + private Integer size; + private List sort; + private List searchAfter; + + public Filter getFilter() { + return filter; + } + + public void setFilter(Filter filter) { + this.filter = filter; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public List getSort() { + return sort; + } + + public void setSort(List sort) { + this.sort = sort; + } + + public List getSearchAfter() { + return searchAfter; + } + + public void setSearchAfter(List searchAfter) { + this.searchAfter = searchAfter; + } + + public static class Builder { + + private Filter filter; + private Integer size; + private List sorts = new ArrayList<>(); + private List searchAfter = null; + + public Builder() {} + + @Deprecated + public Builder withFilter(Filter filter) { + this.filter = filter; + return this; + } + + public Builder filter(Filter filter) { + this.filter = filter; + return this; + } + + @Deprecated + public Builder withSize(Integer size) { + this.size = size; + return this; + } + + public Builder size(Integer size) { + this.size = size; + return this; + } + + @Deprecated + public Builder withSort(Sort sort) { + this.sorts.add(sort); + return this; + } + + public Builder sort(Sort sort) { + this.sorts.add(sort); + return this; + } + + public Builder searchAfter(List searchAfter) { + this.searchAfter = searchAfter; + return this; + } + + public SearchQuery build() throws OperateException { + SearchQuery query = new SearchQuery(); + query.filter = filter; + query.size = size; + query.searchAfter = searchAfter; + if (!sorts.isEmpty()) { + query.setSort(sorts); + } + return query; + } + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/Sort.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/Sort.java new file mode 100644 index 0000000..eece3fc --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/Sort.java @@ -0,0 +1,34 @@ +package io.camunda.operate.search; + +public class Sort { + + private String field; + + private SortOrder order; + + public Sort() { + super(); + } + + public Sort(String field, SortOrder order) { + super(); + this.field = field; + this.order = order; + } + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public SortOrder getOrder() { + return order; + } + + public void setOrder(SortOrder order) { + this.order = order; + } +} diff --git a/src/main/java/io/camunda/operate/search/SortOrder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/SortOrder.java similarity index 80% rename from src/main/java/io/camunda/operate/search/SortOrder.java rename to extension/java-client-operate/src/main/java/io/camunda/operate/search/SortOrder.java index a4bb130..b35ca3c 100644 --- a/src/main/java/io/camunda/operate/search/SortOrder.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/SortOrder.java @@ -1,5 +1,6 @@ package io.camunda.operate.search; public enum SortOrder { - ASC, DESC; + ASC, + DESC; } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilter.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilter.java new file mode 100644 index 0000000..7f4d29c --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilter.java @@ -0,0 +1,10 @@ +package io.camunda.operate.search; + +import io.camunda.operate.model.Variable; + +public class VariableFilter extends Variable implements Filter { + + public static VariableFilterBuilder builder() { + return new VariableFilterBuilder(); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilterBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilterBuilder.java new file mode 100644 index 0000000..4ea2abf --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/search/VariableFilterBuilder.java @@ -0,0 +1,49 @@ +package io.camunda.operate.search; + +public class VariableFilterBuilder { + + VariableFilter filter; + + VariableFilterBuilder() { + filter = new VariableFilter(); + } + + public VariableFilterBuilder key(Long key) { + filter.setKey(key); + return this; + } + + public VariableFilterBuilder processInstanceKey(Long processInstanceKey) { + filter.setProcessInstanceKey(processInstanceKey); + return this; + } + + public VariableFilterBuilder scopeKey(Long scopeKey) { + filter.setScopeKey(scopeKey); + return this; + } + + public VariableFilterBuilder name(String name) { + filter.setName(name); + return this; + } + + public VariableFilterBuilder value(String value) { + filter.setValue(value); + return this; + } + + public VariableFilterBuilder truncated(Boolean truncated) { + filter.setTruncated(truncated); + return this; + } + + public VariableFilterBuilder tenantId(String tenantId) { + filter.setTenantId(tenantId); + return this; + } + + public VariableFilter build() { + return filter; + } +} diff --git a/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java new file mode 100644 index 0000000..d7eaa2b --- /dev/null +++ b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java @@ -0,0 +1,122 @@ +package io.camunda.operate.http; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +import com.google.common.reflect.TypeToken; +import io.camunda.common.json.JsonMapper; +import io.camunda.common.json.SdkObjectMapper; +import io.camunda.operate.auth.Authentication; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.*; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.internal.matchers.apachecommons.ReflectionEquals; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class DefaultHttpClientTest { + + @Mock Authentication authentication; + @Mock CloseableHttpClient chClient; + JsonMapper jsonMapper = new SdkObjectMapper(); + + @Test + public void shouldReturnGetType() throws IOException { + // given + Map, String> productMap = new HashMap<>(); + DefaultHttpClient defaultHttpClient = + new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); + MyResponseClass expectedOutput = new MyResponseClass(); + expectedOutput.setName("test-name"); + + // when + when(chClient.execute(any(HttpGet.class))).thenReturn(response); + + when(response.getCode()).thenReturn(200); + + when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); + + when(response.getEntity().getContent()) + .thenReturn(new ByteArrayInputStream("{\"name\" : \"test-name\"}".getBytes())); + MyResponseClass parsedResponse = defaultHttpClient.get(MyResponseClass.class, "123"); + + // then + assertTrue(new ReflectionEquals(expectedOutput).matches(parsedResponse)); + } + + @Test + public void shouldReturnPostType() throws IOException { + // given + Map, String> productMap = new HashMap<>(); + DefaultHttpClient defaultHttpClient = + new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); + MyResponseClass insideClass = new MyResponseClass(); + insideClass.setName("test-name"); + List expectedOutput = new ArrayList<>(); + expectedOutput.add(insideClass); + + // when + when(chClient.execute(any(HttpPost.class))).thenReturn(response); + when(response.getCode()).thenReturn(200); + when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); + when(response.getEntity().getContent()) + .thenReturn(new ByteArrayInputStream("[{\"name\" : \"test-name\"}]".getBytes())); + List parsedResponse = + defaultHttpClient.post( + List.class, MyResponseClass.class, TypeToken.of(MyResponseClass.class), "dummy"); + + // then + assertEquals(expectedOutput.size(), parsedResponse.size()); + assertTrue(new ReflectionEquals(expectedOutput.get(0)).matches(parsedResponse.get(0))); + } + + @Test + public void shouldReturnDeleteType() throws IOException { + // given + Map, String> productMap = new HashMap<>(); + DefaultHttpClient defaultHttpClient = + new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); + MyResponseClass expectedOutput = new MyResponseClass(); + expectedOutput.setName("test-name"); + + // when + when(chClient.execute(any(HttpDelete.class))).thenReturn(response); + + when(response.getCode()).thenReturn(200); + + when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); + + when(response.getEntity().getContent()) + .thenReturn(new ByteArrayInputStream("{\"name\" : \"test-name\"}".getBytes())); + MyResponseClass parsedResponse = + defaultHttpClient.delete(MyResponseClass.class, MySelectorClass.class, 123L); + + // then + assertTrue(new ReflectionEquals(expectedOutput).matches(parsedResponse)); + } + + // TODO: add more tests for retrieving the right url path based on input + + public static class MyResponseClass { + private String name; + + public void setName(String name) { + this.name = name; + } + } + + public static class MySelectorClass {} +} diff --git a/extension/pom.xml b/extension/pom.xml new file mode 100644 index 0000000..9f28d73 --- /dev/null +++ b/extension/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + io.camunda.spring + operate-client-root + 8.6.0-alpha1-SNAPSHOT + + + operate-client-parent + pom + + + + + io.camunda.spring + java-common + ${project.version} + + + + + + + + java-client-operate + spring-boot-starter-camunda-operate + + diff --git a/extension/spring-boot-starter-camunda-operate/pom.xml b/extension/spring-boot-starter-camunda-operate/pom.xml new file mode 100644 index 0000000..f76a019 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + io.camunda.spring + operate-client-parent + 8.6.0-alpha1-SNAPSHOT + + + spring-boot-starter-camunda-operate + + + + org.springframework.boot + spring-boot-starter + + + io.camunda.spring + java-client-operate + + + + \ No newline at end of file diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java new file mode 100644 index 0000000..dac3776 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java @@ -0,0 +1,73 @@ +package io.camunda.operate.spring; + +import io.camunda.common.json.JsonMapper; +import io.camunda.operate.CamundaOperateClient; +import io.camunda.operate.CamundaOperateClientConfiguration; +import io.camunda.operate.auth.Authentication; +import io.camunda.operate.auth.JwtAuthentication; +import io.camunda.operate.auth.JwtCredential; +import io.camunda.operate.auth.SimpleAuthentication; +import io.camunda.operate.auth.SimpleCredential; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +@EnableConfigurationProperties({ + OperateClientConfigurationProperties.class, +}) +@ConditionalOnProperty(value = "operate.client.enabled", matchIfMissing = true) +public class OperateClientConfiguration { + private final OperateClientConfigurationProperties properties; + private final JsonMapper jsonMapper; + + @Autowired + public OperateClientConfiguration( + OperateClientConfigurationProperties properties, JsonMapper jsonMapper) { + this.properties = properties; + this.jsonMapper = jsonMapper; + } + + @Bean + @ConditionalOnMissingBean + public CamundaOperateClient camundaOperateClient( + CamundaOperateClientConfiguration configuration) { + return new CamundaOperateClient(configuration); + } + + @Bean + @ConditionalOnMissingBean + public CamundaOperateClientConfiguration operateClientConfiguration( + Authentication authentication) { + return new CamundaOperateClientConfiguration(authentication, properties.baseUrl()); + } + + @Bean + @ConditionalOnMissingBean + public Authentication authentication() { + if (properties.profile() == null) { + throw new IllegalStateException("'operate.client.profile' is required"); + } + switch (properties.profile()) { + case simple -> { + return new SimpleAuthentication( + new SimpleCredential( + properties.username(), + properties.password(), + properties.baseUrl(), + properties.sessionTimeout())); + } + case oidc, saas -> { + return new JwtAuthentication( + new JwtCredential( + properties.clientId(), + properties.clientSecret(), + properties.audience(), + properties.authUrl().toString()), + jsonMapper); + } + default -> throw new IllegalStateException("Unsupported profile: " + properties.profile()); + } + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java new file mode 100644 index 0000000..a582138 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java @@ -0,0 +1,30 @@ +package io.camunda.operate.spring; + +import java.net.URL; +import java.time.Duration; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("operate.client") +public record OperateClientConfigurationProperties( + // generic properties + Profile profile, + Boolean enabled, + URL baseUrl, + // simple auth properties + String username, + String password, + Duration sessionTimeout, + // oidc auth properties + String clientId, + String clientSecret, + URL authUrl, + String audience, + // saas auth properies + String region, + String clusterId) { + public enum Profile { + simple, + oidc, + saas + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperatePropertiesPostProcessor.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperatePropertiesPostProcessor.java new file mode 100644 index 0000000..b2f8880 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperatePropertiesPostProcessor.java @@ -0,0 +1,48 @@ +package io.camunda.operate.spring; + +import io.camunda.operate.spring.OperateClientConfigurationProperties.Profile; +import java.util.List; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.env.YamlPropertySourceLoader; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertySource; +import org.springframework.core.io.ClassPathResource; + +public class OperatePropertiesPostProcessor implements EnvironmentPostProcessor { + + @Override + public void postProcessEnvironment( + ConfigurableEnvironment environment, SpringApplication application) { + try { + Profile profile = environment.getProperty("operate.client.profile", Profile.class); + if (profile == null) { + return; + } + YamlPropertySourceLoader loader = new YamlPropertySourceLoader(); + String propertiesFile = "operate-profiles/" + determinePropertiesFile(profile); + ClassPathResource resource = new ClassPathResource(propertiesFile); + List> props = loader.load(propertiesFile, resource); + for (PropertySource prop : props) { + environment.getPropertySources().addLast(prop); // lowest priority + } + } catch (Exception e) { + throw new IllegalStateException("Error while post processing camunda properties", e); + } + } + + private String determinePropertiesFile(Profile clientMode) { + switch (clientMode) { + case oidc -> { + return "oidc.yaml"; + } + case saas -> { + return "saas.yaml"; + } + case simple -> { + return "simple.yaml"; + } + } + throw new IllegalStateException("Unknown client mode " + clientMode); + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring.factories b/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..b3aeb2e --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.env.EnvironmentPostProcessor=io.camunda.operate.spring.OperatePropertiesPostProcessor diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3c1ac67 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +io.camunda.operate.spring.OperateClientConfiguration \ No newline at end of file diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml b/extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml new file mode 100644 index 0000000..e69de29 diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/oidc.yaml b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/oidc.yaml new file mode 100644 index 0000000..32951e2 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/oidc.yaml @@ -0,0 +1,8 @@ +operate: + client: + profile: oidc + enabled: true + base-url: http://localhost:8081 + auth-url: http://localhost:18080/auth/realms/camunda-platform/openid-connect/token + audience: operate-api + diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/saas.yaml b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/saas.yaml new file mode 100644 index 0000000..be55b03 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/saas.yaml @@ -0,0 +1,7 @@ +operate: + client: + profile: saas + enabled: true + base-url: https://${operate.client.region}.operate.camunda.io/${operate.client.cluster-id} + auth-url: https://login.cloud.camunda.io/oauth/token + audience: operate.camunda.io diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/simple.yaml b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/simple.yaml new file mode 100644 index 0000000..1cfdd80 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/resources/operate-profiles/simple.yaml @@ -0,0 +1,8 @@ +operate: + client: + profile: simple + enabled: true + base-url: http://localhost:8081 + session-timeout: PT10M + username: demo + password: demo diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927a4d4fb3f96a785543079b8df6723c946b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59821 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 00e33ed..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..cd60894 --- /dev/null +++ b/pom.xml @@ -0,0 +1,423 @@ + + 4.0.0 + + + org.camunda.community + community-hub-release-parent + 1.4.4 + + io.camunda.spring + operate-client-root + 8.6.0-alpha1-SNAPSHOT + pom + + + ${project.build.sourceEncoding} + 17 + ${version.java} + + ${java.version} + ${java.version} + + 8.5.3 + 8.5.2 + + 3.3.0 + 1.9.4 + 2.2.0 + 2.17.1 + 3.14.0 + + 3.5.0 + + 3.1.1 + + -Xdoclint:none + + + https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ + https://artifacts.camunda.com/artifactory/zeebe-io/ + + + + + extension + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + import + pom + + + io.camunda + zeebe-bom + ${zeebe.version} + import + pom + + + io.camunda + zeebe-bpmn-model + ${zeebe.version} + + + io.camunda + zeebe-process-test-extension + ${zeebe.version} + + + io.camunda + zeebe-process-test-extension-testcontainer + ${zeebe.version} + + + io.camunda.spring + spring-client-annotations + ${project.version} + + + io.camunda.spring + spring-client-common + ${project.version} + + + io.camunda.spring + spring-client-zeebe + ${project.version} + + + io.camunda.spring + java-client-operate + ${project.version} + + + io.camunda.spring + spring-client-console + ${project.version} + + + io.camunda.spring + spring-boot-starter-camunda + ${project.version} + + + io.camunda.spring + spring-boot-starter-camunda-test-common + ${project.version} + + + io.camunda.spring + spring-boot-starter-camunda-test + ${project.version} + + + io.camunda.spring + spring-boot-starter-camunda-test-testcontainer + ${project.version} + + + io.camunda + identity-sdk + ${identity.version} + + + io.camunda + identity-spring-boot-starter + ${identity.version} + + + io.camunda + identity-spring-boot-autoconfigure + ${identity.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + org.awaitility + awaitility + 4.2.1 + + + commons-beanutils + commons-beanutils + ${commons-beanutils.version} + + + io.github.resilience4j + resilience4j-retry + ${resilience4j.version} + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + + + + + + clean install + + + + + com.mycila + license-maven-plugin + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${java.version} + ${java.version} + ${java.version} + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.version.maven-enforcer-plugin} + + + + true + + + + + + + + enforce + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + default-compile + none + + + + default-testCompile + none + + + java-compile + compile + + compile + + + + java-test-compile + test-compile + + testCompile + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + + prepare-agent + + + + report + test + + report + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.43.0 + + + + + *.md + .gitignore + + + + + true + 2 + + + + + + + + + + + + + + + + autoFormat + + true + + + + + com.diffplug.spotless + spotless-maven-plugin + + + spotless-format + + apply + + process-sources + + + + + + + + + + checkFormat + + + + com.diffplug.spotless + spotless-maven-plugin + + + spotless-check + + check + + validate + + + + + + + + + + + zeebe-snapshots + Zeebe Snapshot Repository + https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ + + false + + + true + + + + connectors-snapshots + Connectors Snapshot Repository + https://artifacts.camunda.com/artifactory/connectors-snapshots/ + + false + + + true + + + + identity + Identity Repository + https://artifacts.camunda.com/artifactory/camunda-identity + + false + + + + + + + Jan Galinski + Holisticon AG + https://jangalinski.github.io + + initiator + + + + + + + Apache License + + + + + https://github.com/camunda-community-hub/spring-zeebe + scm:git:git@github.com:camunda-community-hub/spring-zeebe.git + scm:git:git@github.com:camunda-community-hub/spring-zeebe.git + HEAD + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index ac7b98d..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'camunda-operate-client-java' diff --git a/src/main/java/io/camunda/operate/CamundaOperateClient.java b/src/main/java/io/camunda/operate/CamundaOperateClient.java deleted file mode 100644 index f7164b4..0000000 --- a/src/main/java/io/camunda/operate/CamundaOperateClient.java +++ /dev/null @@ -1,286 +0,0 @@ -package io.camunda.operate; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.hc.client5.http.classic.methods.HttpGet; -import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.classic.HttpClients; -import org.apache.hc.core5.http.ClassicHttpRequest; -import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.io.entity.StringEntity; - -import io.camunda.operate.auth.AuthInterface; -import io.camunda.operate.beta.CamundaOperateBetaClient; -import io.camunda.operate.dto.FlownodeInstance; -import io.camunda.operate.dto.Incident; -import io.camunda.operate.dto.ProcessDefinition; -import io.camunda.operate.dto.ProcessInstance; -import io.camunda.operate.dto.SearchResult; -import io.camunda.operate.dto.Variable; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.search.SearchQuery; -import io.camunda.operate.util.Java8Utils; -import io.camunda.operate.util.JsonUtils; -import io.camunda.operate.util.QueryValidatorUtils; -import io.camunda.zeebe.model.bpmn.Bpmn; -import io.camunda.zeebe.model.bpmn.BpmnModelInstance; - -public class CamundaOperateClient { - - private AuthInterface authentication; - - private String operateUrl; - - private Header authHeader; - - private int tokenExpiration; - - public ProcessDefinition getProcessDefinition(Long key) throws OperateException { - return get(key, ProcessDefinition.class); - } - - public List searchProcessDefinitions(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, ProcessDefinition.class); - return search(query, ProcessDefinition.class).getItems(); - } - - public SearchResult searchProcessDefinitionResults(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, ProcessDefinition.class); - return search(query, ProcessDefinition.class); - } - - public String getProcessDefinitionXml(Long key) throws OperateException { - String url = operateUrl + CamundaOperateConstants.OBJECT_APIS.get(ProcessDefinition.class) + "/" + key + "/xml"; - - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(authHeader); - - try { - return executeQuery(httpGet); - } catch (OperateException e) { - throw new OperateException("Error get Process Definition XML for " + key, e); - } - } - - public BpmnModelInstance getProcessDefinitionModel(Long key) throws OperateException { - String url = operateUrl + CamundaOperateConstants.OBJECT_APIS.get(ProcessDefinition.class) + "/" + key + "/xml"; - - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(authHeader); - - try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - try (CloseableHttpResponse response = execute(httpClient, httpGet)) { - InputStream processInputStream = new ByteArrayInputStream( - Java8Utils.readAllBytes(response.getEntity().getContent())); - return Bpmn.readModelFromStream(processInputStream); - } - } catch (IOException e) { - throw new OperateException(e); - } - } - public CloseableHttpResponse execute(CloseableHttpClient httpClient, ClassicHttpRequest request) throws IOException, OperateException { - return execute(httpClient, request, 0); - } - private CloseableHttpResponse execute(CloseableHttpClient httpClient, ClassicHttpRequest request, int count) throws IOException, OperateException { - CloseableHttpResponse response = httpClient.execute(request); - if (response.getCode()==401 && count<=2) { - authentication.authenticate(this); - request.setHeader(authHeader); - return execute(httpClient, request, ++count); - } - if (response.getCode()>399) { - throw createDetailedException(response, request); - } - return response; - } - - private OperateException createDetailedException(CloseableHttpResponse response, ClassicHttpRequest request) throws IOException { - return new OperateException(request.getPath()+" : "+response.getCode()+" "+response.getReasonPhrase()); - } - - public ProcessInstance getProcessInstance(Long key) throws OperateException { - return get(key, ProcessInstance.class); - } - - public List searchProcessInstances(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, ProcessInstance.class); - return search(query, ProcessInstance.class).getItems(); - } - - public SearchResult searchProcessInstanceResults(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, ProcessInstance.class); - return search(query, ProcessInstance.class); - } - - public FlownodeInstance getFlownodeInstance(Long key) throws OperateException { - return get(key, FlownodeInstance.class); - } - - public List searchFlownodeInstances(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, FlownodeInstance.class); - return search(query, FlownodeInstance.class).getItems(); - } - - public SearchResult searchFlownodeInstanceResults(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, FlownodeInstance.class); - return search(query, FlownodeInstance.class); - } - - public Incident getIncident(Long key) throws OperateException { - return get(key, Incident.class); - } - - public List searchIncidents(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, Incident.class); - return search(query, Incident.class).getItems(); - } - - public SearchResult searchIncidentResults(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, Incident.class); - return search(query, Incident.class); - } - - public Variable getVariable(Long key) throws OperateException { - return get(key, Variable.class); - } - - public List searchVariables(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, Variable.class); - return search(query, Variable.class).getItems(); - } - - public SearchResult searchVariableResults(SearchQuery query) throws OperateException { - QueryValidatorUtils.verifyQuery(query, Variable.class); - return search(query, Variable.class); - } - - public SearchResult search(SearchQuery query, Class resultType) throws OperateException { - if (query==null || resultType==null) { - throw new OperateException("Query and resultType shouldn't be null"); - } - HttpPost httpPost = new HttpPost(operateUrl + CamundaOperateConstants.OBJECT_APIS.get(resultType) + "/search"); - httpPost.addHeader("Content-Type", "application/json"); - httpPost.addHeader(authHeader); - - try { - String data = JsonUtils.toJson(query); - httpPost.setEntity(new StringEntity(data)); - return JsonUtils.toSearchResult(executeQuery(httpPost), resultType); - } catch (IOException e) { - throw new OperateException("Error executing the SearchQuery", e); - } - } - - private T get(Long key, Class resultType) throws OperateException { - if (key==null || resultType==null) { - throw new OperateException("Key and resultType shouldn't be null"); - } - String url = operateUrl + CamundaOperateConstants.OBJECT_APIS.get(resultType) + "/" + key; - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader("Content-Type", "application/json"); - httpGet.addHeader(authHeader); - - try { - return JsonUtils.toResult(executeQuery(httpGet), resultType); - } catch (IOException e) { - throw new OperateException("Error executing get for (key : " + key + ")" + resultType.getName() + " on "+url, - e); - } - } - - protected String executeQuery(ClassicHttpRequest httpRequest) throws OperateException { - reconnectEventually(); - try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - try (CloseableHttpResponse response = execute(httpClient, httpRequest)) { - return new String(Java8Utils.readAllBytes(response.getEntity().getContent()), StandardCharsets.UTF_8); - } - } catch (IOException e) { - throw new OperateException(e); - } - } - - public String getOperateUrl() { - return operateUrl; - } - - public void setOperateUrl(String operateUrl) { - this.operateUrl = operateUrl; - } - - public Header getAuthHeader() { - return authHeader; - } - - public void setAuthHeader(Header authHeader) { - this.authHeader = authHeader; - } - - public void setTokenExpiration(int tokenExpiration) { - this.tokenExpiration = tokenExpiration; - } - - private void reconnectEventually() throws OperateException { - if (this.tokenExpiration>0 && this.tokenExpiration<(System.currentTimeMillis()/1000-3)) { - authentication.authenticate(this); - } - } - - public static class Builder { - - private AuthInterface authentication; - - private String operateUrl; - - private boolean beta; - - public Builder() { - - } - - public Builder beta() { - beta = true; - return this; - } - - public Builder authentication(AuthInterface authentication) { - this.authentication = authentication; - return this; - } - - public Builder operateUrl(String operateUrl) { - this.operateUrl = formatUrl(operateUrl); - return this; - } - - public CamundaOperateClient build() throws OperateException { - CamundaOperateClient client; - if (beta) { - client = new CamundaOperateBetaClient(); - } else { - client = new CamundaOperateClient(); - } - client.authentication = authentication; - client.operateUrl = operateUrl; - authentication.authenticate(client); - return client; - } - - private String formatUrl(String url) { - if (url.endsWith("/")) { - return url.substring(0, url.length()-1); - } - return url; - } - } - - -} diff --git a/src/main/java/io/camunda/operate/CamundaOperateConstants.java b/src/main/java/io/camunda/operate/CamundaOperateConstants.java deleted file mode 100644 index 6323b89..0000000 --- a/src/main/java/io/camunda/operate/CamundaOperateConstants.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.camunda.operate; - -import java.util.Map; - -import io.camunda.operate.dto.FlownodeInstance; -import io.camunda.operate.dto.Incident; -import io.camunda.operate.dto.ProcessDefinition; -import io.camunda.operate.dto.ProcessInstance; -import io.camunda.operate.dto.Variable; -import io.camunda.operate.util.Java8Utils; - -public class CamundaOperateConstants { - - public static Map, String> OBJECT_APIS = Java8Utils.toMap(ProcessDefinition.class, "/v1/process-definitions", - ProcessInstance.class, "/v1/process-instances", - FlownodeInstance.class, "/v1/flownode-instances", - Incident.class, "/v1/incidents", - Variable.class, "/v1/variables"); - -} diff --git a/src/main/java/io/camunda/operate/auth/AuthInterface.java b/src/main/java/io/camunda/operate/auth/AuthInterface.java deleted file mode 100644 index c018bec..0000000 --- a/src/main/java/io/camunda/operate/auth/AuthInterface.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.camunda.operate.auth; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; - -public interface AuthInterface { - public void authenticate(CamundaOperateClient client) throws OperateException; -} diff --git a/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/src/main/java/io/camunda/operate/auth/JwtAuthentication.java deleted file mode 100644 index 5f706c5..0000000 --- a/src/main/java/io/camunda/operate/auth/JwtAuthentication.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.camunda.operate.auth; - -import java.util.Base64; - -import org.apache.hc.core5.http.message.BasicHeader; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; - -public abstract class JwtAuthentication implements AuthInterface { - - private static final ObjectMapper MAPPER = new ObjectMapper(); - private static final Base64.Decoder DECODER = Base64.getUrlDecoder(); - - public int getExpiration(String token) throws OperateException { - try { - String[] chunks = token.split("\\."); - String payload = new String(DECODER.decode(chunks[1])); - JsonNode jsonPayload = MAPPER.readValue(payload, JsonNode.class); - JsonNode exp = jsonPayload.get("exp"); - if (exp==null) { - return 0; - } else { - return exp.asInt(); - } - } catch (JsonProcessingException e) { - throw new OperateException("Token is not readable", e); - } - } - - public void setToken(CamundaOperateClient client, String token) throws OperateException { - client.setAuthHeader(new BasicHeader("Authorization", "Bearer " + token)); - client.setTokenExpiration(getExpiration(token)); - } -} diff --git a/src/main/java/io/camunda/operate/auth/LocalIdentityAuthentication.java b/src/main/java/io/camunda/operate/auth/LocalIdentityAuthentication.java deleted file mode 100644 index 9b702d9..0000000 --- a/src/main/java/io/camunda/operate/auth/LocalIdentityAuthentication.java +++ /dev/null @@ -1,98 +0,0 @@ -package io.camunda.operate.auth; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -import com.fasterxml.jackson.databind.JsonNode; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.util.JsonUtils; - -/** - * This Class is used to authenticate against a Self-Managed Camunda 8 Operate. - * @deprecated replaced by {@link io.camunda.operate.auth.SelfManagedAuthentication} - */ -@Deprecated -public class LocalIdentityAuthentication extends JwtAuthentication { - - private String clientId; - private String clientSecret; - private String baseUrl = "http://localhost:18080"; - private String keycloakRealm = "camunda-platform"; - - public LocalIdentityAuthentication() { - } - - public LocalIdentityAuthentication(String clientId, String clientSecret) { - this.clientId = clientId; - this.clientSecret = clientSecret; - } - - public LocalIdentityAuthentication clientId(String clientId) { - this.clientId = clientId; - return this; - } - public LocalIdentityAuthentication clientSecret(String clientSecret) { - this.clientSecret = clientSecret; - return this; - } - public LocalIdentityAuthentication baseUrl(String url) { - this.baseUrl = url; - return this; - } - public LocalIdentityAuthentication keycloakRealm(String keycloakRealm) { - this.keycloakRealm = keycloakRealm; - return this; - } - - private String encode(String value) throws UnsupportedEncodingException { - return URLEncoder.encode(value, StandardCharsets.UTF_8.toString()); - } - - private String getConnectionString() throws UnsupportedEncodingException{ - return "grant_type=client_credentials&client_id="+encode(clientId)+"&client_secret="+encode(clientSecret); - } - - @Override - public void authenticate(CamundaOperateClient client) throws OperateException { - try { - URL url = new URL(this.baseUrl+"/auth/realms/"+keycloakRealm+"/protocol/openid-connect/token"); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - conn.setUseCaches(false); - conn.setConnectTimeout(1000 * 5); - conn.setDoOutput(true); - conn.setDoInput(true); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - - String data = getConnectionString(); - - conn.getOutputStream().write(data.getBytes(StandardCharsets.UTF_8)); - conn.connect(); - - if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) { - try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"))) { - StringBuilder response = new StringBuilder(); - String responseLine = null; - while ((responseLine = br.readLine()) != null) { - response.append(responseLine.trim()); - } - JsonNode responseBody = JsonUtils.toJsonNode(response.toString()); - String token = responseBody.get("access_token").asText(); - setToken(client, token); - } - } else { - throw new OperateException("Error "+conn.getResponseCode()+" obtaining access token : "+conn.getResponseMessage()); - } - } catch (IOException e) { - throw new OperateException(e); - } - } -} diff --git a/src/main/java/io/camunda/operate/auth/SaasAuthentication.java b/src/main/java/io/camunda/operate/auth/SaasAuthentication.java deleted file mode 100644 index 3c54d1d..0000000 --- a/src/main/java/io/camunda/operate/auth/SaasAuthentication.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.camunda.operate.auth; - -import java.io.IOException; - -import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.classic.HttpClients; -import org.apache.hc.core5.http.io.entity.StringEntity; - -import com.fasterxml.jackson.databind.JsonNode; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.util.JsonUtils; - -public class SaasAuthentication extends JwtAuthentication { - - private String clientId; - private String clientSecret; - - private String baseUrl; - private String authUrl; - - public SaasAuthentication(String clientId, String clientSecret) { - this.clientId = clientId; - this.clientSecret = clientSecret; - - this.authUrl = "https://login.cloud.camunda.io/oauth/token"; - this.baseUrl = "operate.camunda.io"; - } - - public SaasAuthentication(String authUrl, String baseUrl, String clientId, String clientSecret) { - this.clientId = clientId; - this.clientSecret = clientSecret; - this.baseUrl = baseUrl; - this.authUrl = authUrl; - } - - @Override - public void authenticate(CamundaOperateClient client) throws OperateException { - - HttpPost httpPost = new HttpPost(authUrl); - httpPost.addHeader("Content-Type", "application/json"); - - String data = "{\"grant_type\":\"client_credentials\", \"audience\":\"" + baseUrl + "\", \"client_id\": \"" - + clientId + "\", \"client_secret\":\"" + clientSecret + "\"}"; - httpPost.setEntity(new StringEntity(data)); - - try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - try (CloseableHttpResponse response = client.execute(httpClient, httpPost)) { - JsonNode responseBody = JsonUtils.toJsonNode(response.getEntity().getContent()); - String token = responseBody.get("access_token").asText(); - - setToken(client, token); - } - } catch (IOException e) { - throw new OperateException(e); - } - } -} diff --git a/src/main/java/io/camunda/operate/auth/SelfManagedAuthentication.java b/src/main/java/io/camunda/operate/auth/SelfManagedAuthentication.java deleted file mode 100644 index 6baf765..0000000 --- a/src/main/java/io/camunda/operate/auth/SelfManagedAuthentication.java +++ /dev/null @@ -1,105 +0,0 @@ -package io.camunda.operate.auth; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -import com.fasterxml.jackson.databind.JsonNode; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.util.JsonUtils; - -/** - * This Class is used to authenticate against a Self-Managed Camunda 8 Operate. - */ -public class SelfManagedAuthentication extends JwtAuthentication { - - private String clientId; - private String clientSecret; - private String keycloakUrl = "http://localhost:18080"; - private String keycloakRealm = "camunda-platform"; - private String keycloakTokenUrl = null; - - public SelfManagedAuthentication() { - } - - public SelfManagedAuthentication(String clientId, String clientSecret) { - this.clientId = clientId; - this.clientSecret = clientSecret; - } - - public SelfManagedAuthentication clientId(String clientId) { - this.clientId = clientId; - return this; - } - public SelfManagedAuthentication clientSecret(String clientSecret) { - this.clientSecret = clientSecret; - return this; - } - public SelfManagedAuthentication keycloakUrl(String url) { - this.keycloakUrl = url; - return this; - } - public SelfManagedAuthentication keycloakRealm(String keycloakRealm) { - this.keycloakRealm = keycloakRealm; - return this; - } - public SelfManagedAuthentication keycloakTokenUrl(String keycloakTokenUrl) { - this.keycloakTokenUrl = keycloakTokenUrl; - return this; - } - - private String encode(String value) throws UnsupportedEncodingException { - return URLEncoder.encode(value, StandardCharsets.UTF_8.toString()); - } - - private String getConnectionString() throws UnsupportedEncodingException{ - return "grant_type=client_credentials&client_id="+encode(clientId)+"&client_secret="+encode(clientSecret); - } - - @Override - public void authenticate(CamundaOperateClient client) throws OperateException { - try { - String tokenUrl = keycloakTokenUrl; - if (tokenUrl==null || tokenUrl.equals("")) { - tokenUrl=this.keycloakUrl+"/auth/realms/"+keycloakRealm+"/protocol/openid-connect/token"; - } - URL url = new URL(tokenUrl); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - conn.setUseCaches(false); - conn.setConnectTimeout(1000 * 5); - conn.setDoOutput(true); - conn.setDoInput(true); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - - String data = getConnectionString(); - - conn.getOutputStream().write(data.getBytes(StandardCharsets.UTF_8)); - conn.connect(); - - if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) { - try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"))) { - StringBuilder response = new StringBuilder(); - String responseLine = null; - while ((responseLine = br.readLine()) != null) { - response.append(responseLine.trim()); - } - JsonNode responseBody = JsonUtils.toJsonNode(response.toString()); - String token = responseBody.get("access_token").asText(); - setToken(client, token); - } - } else { - throw new OperateException("Error "+conn.getResponseCode()+" obtaining access token : "+conn.getResponseMessage()); - } - } catch (IOException e) { - throw new OperateException(e); - } - } -} diff --git a/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java b/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java deleted file mode 100644 index a64f1b1..0000000 --- a/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.camunda.operate.auth; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; -import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.classic.HttpClients; -import org.apache.hc.core5.http.NameValuePair; -import org.apache.hc.core5.http.ProtocolException; -import org.apache.hc.core5.http.message.BasicHeader; -import org.apache.hc.core5.http.message.BasicNameValuePair; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.exception.OperateException; - -/** - * To use if Operate is not configured with Identity and Keycloak - */ -public class SimpleAuthentication implements AuthInterface { - - private String operateUsername; - - private String operatePassword; - - private String operateUrl; - - public SimpleAuthentication(String operateUsername, String operatePassword, String operateUrl) { - this.operateUsername = operateUsername; - this.operatePassword = operatePassword; - this.operateUrl = operateUrl; - } - - @Override - public void authenticate(CamundaOperateClient client) throws OperateException { - - HttpPost httpPost = new HttpPost(operateUrl + "/api/login"); - - List params = new ArrayList(); - params.add(new BasicNameValuePair("username", operateUsername)); - params.add(new BasicNameValuePair("password", operatePassword)); - httpPost.setEntity(new UrlEncodedFormEntity(params)); - - try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - try (CloseableHttpResponse response = httpClient.execute(httpPost)) { - String cookie = response.getHeader("Set-Cookie").getValue(); - - client.setAuthHeader(new BasicHeader("Cookie", cookie)); - } - } catch (IOException | ProtocolException e) { - throw new OperateException(e); - } - } -} diff --git a/src/main/java/io/camunda/operate/beta/CamundaOperateBetaClient.java b/src/main/java/io/camunda/operate/beta/CamundaOperateBetaClient.java deleted file mode 100644 index d96c949..0000000 --- a/src/main/java/io/camunda/operate/beta/CamundaOperateBetaClient.java +++ /dev/null @@ -1,102 +0,0 @@ -package io.camunda.operate.beta; - -import java.io.IOException; -import java.util.ArrayList; - -import org.apache.hc.client5.http.classic.methods.HttpGet; -import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.core5.http.io.entity.StringEntity; - -import com.fasterxml.jackson.databind.JsonNode; - -import io.camunda.operate.CamundaOperateClient; -import io.camunda.operate.beta.model.AuditTrail; -import io.camunda.operate.beta.model.AuditTrailStep; -import io.camunda.operate.beta.model.FlowNodeInstanceQueryList; -import io.camunda.operate.dto.ProcessInstance; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.util.JsonUtils; -import io.camunda.zeebe.model.bpmn.BpmnModelInstance; - -/** - * Beta client to use undocumented APIs that could not be compatible in future releases - */ -public class CamundaOperateBetaClient extends CamundaOperateClient { - - /** - * working fine with SaaS version 8.0.0 or if you use the local setup without Keycloak and identity - */ - public JsonNode getFlowNodeStates(Long processInstanceId) throws OperateException { - String url = getOperateUrl()+"/api/process-instances/"+processInstanceId+"/flow-node-states"; - HttpGet httpPost = new HttpGet(url); - httpPost.addHeader(getAuthHeader()); - httpPost.addHeader("content-type", "application/json"); - - try { - - return JsonUtils.toJsonNode(executeQuery(httpPost)); - } catch(IOException e) { - throw new OperateException("BETA : Error getting FlowNodeInstances", e); - } - } - - /** - * working fine with SaaS version 8.0.0 or if you use the local setup without Keycloak and identity - */ - public JsonNode getFlowNodeInstances(Long processInstanceId) throws OperateException { - String url = getOperateUrl()+"/api/flow-node-instances"; - FlowNodeInstanceQueryList query = new FlowNodeInstanceQueryList.Builder().processInstanceId(processInstanceId).build(); - - HttpPost httpPost = new HttpPost(url); - httpPost.addHeader(getAuthHeader()); - httpPost.addHeader("content-type", "application/json"); - try { - String data = JsonUtils.toJson(query); - httpPost.setEntity(new StringEntity(data)); - - return JsonUtils.toJsonNode(executeQuery(httpPost)); - } catch(IOException e) { - throw new OperateException("BETA : Error getting FlowNodeInstances", e); - } - } - - /** - * working fine with SaaS version 8.0.0 or if you use the local setup without Keycloak and identity - */ - public AuditTrail getAuditTrail(Long processInstanceId) throws OperateException { - - AuditTrail auditTrail = new AuditTrail(); - ProcessInstance processInstance = getProcessInstance(processInstanceId); - auditTrail.setProcessName(processInstance.getBpmnProcessId()); - auditTrail.setProcessVersion(processInstance.getProcessVersion()); - auditTrail.setSteps(new ArrayList<>()); - Long processDefinitionKey = processInstance.getProcessDefinitionKey(); - BpmnModelInstance bpmModel = getProcessDefinitionModel(processDefinitionKey); - - JsonNode flowNodeInstances = getFlowNodeInstances(processInstanceId); - JsonNode flowNodesChildren = flowNodeInstances.get(""+processInstanceId).get("children"); - if (flowNodesChildren.isArray()) { - for (JsonNode jsonNode : flowNodesChildren) { - String type = jsonNode.get("type").asText(); - if (!type.endsWith("GATEWAY")) { - AuditTrailStep auditTrailStep = new AuditTrailStep(); - String stepId = jsonNode.get("flowNodeId").asText(); - auditTrailStep.setName(bpmModel.getModelElementById(stepId).getAttributeValue("name")); - auditTrailStep.setType(type); - String startDate = jsonNode.get("startDate").asText(); - String endDate = jsonNode.get("endDate").asText(); - if (!startDate.equals("null")) { - auditTrailStep.setStartDate(startDate.substring(0,19)); - } - if (!endDate.equals("null")) { - auditTrailStep.setEndDate(endDate.substring(0,19)); - } else { - auditTrailStep.setEndDate("pending"); - } - auditTrail.getSteps().add(auditTrailStep); - } - } - } - return auditTrail; - } -} diff --git a/src/main/java/io/camunda/operate/beta/model/AuditTrail.java b/src/main/java/io/camunda/operate/beta/model/AuditTrail.java deleted file mode 100644 index 44a2eca..0000000 --- a/src/main/java/io/camunda/operate/beta/model/AuditTrail.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.camunda.operate.beta.model; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -@JsonInclude(Include.NON_NULL) -public class AuditTrail { - - private String processName; - private Long processVersion; - public String getProcessName() { - return processName; - } - - public void setProcessName(String processName) { - this.processName = processName; - } - - public Long getProcessVersion() { - return processVersion; - } - - public void setProcessVersion(Long processVersion) { - this.processVersion = processVersion; - } - - private List steps; - - public List getSteps() { - return steps; - } - - public void setSteps(List steps) { - this.steps = steps; - } - -} diff --git a/src/main/java/io/camunda/operate/beta/model/AuditTrailStep.java b/src/main/java/io/camunda/operate/beta/model/AuditTrailStep.java deleted file mode 100644 index c3eecf5..0000000 --- a/src/main/java/io/camunda/operate/beta/model/AuditTrailStep.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.camunda.operate.beta.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -@JsonInclude(Include.NON_NULL) -public class AuditTrailStep { - private String name; - private String type; - private String startDate; - private String endDate; - private String assignee; - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public String getStartDate() { - return startDate; - } - public void setStartDate(String startDate) { - this.startDate = startDate; - } - public String getEndDate() { - return endDate; - } - public void setEndDate(String endDate) { - this.endDate = endDate; - } - public String getAssignee() { - return assignee; - } - public void setAssignee(String assignee) { - this.assignee = assignee; - } -} diff --git a/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQuery.java b/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQuery.java deleted file mode 100644 index 849d7e9..0000000 --- a/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQuery.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.camunda.operate.beta.model; - -public class FlowNodeInstanceQuery { - - private Long treePath; - - private Long processInstanceId; - - private int pageSize; - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public Long getTreePath() { - return treePath; - } - - public void setTreePath(Long treePath) { - this.treePath = treePath; - } - - public Long getProcessInstanceId() { - return processInstanceId; - } - - public void setProcessInstanceId(Long processInstanceId) { - this.processInstanceId = processInstanceId; - } - - -} diff --git a/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQueryList.java b/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQueryList.java deleted file mode 100644 index 5580b4d..0000000 --- a/src/main/java/io/camunda/operate/beta/model/FlowNodeInstanceQueryList.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.camunda.operate.beta.model; - -import java.util.Arrays; -import java.util.List; - -public class FlowNodeInstanceQueryList { - - private List queries; - - public List getQueries() { - return queries; - } - - public void setQueries(List queries) { - this.queries = queries; - } - public static class Builder { - - private Long processInstanceId; - - public Builder processInstanceId(Long processInstanceId) { - this.processInstanceId = processInstanceId; - return this; - } - - public FlowNodeInstanceQueryList build() { - FlowNodeInstanceQuery flowNodeInstanceQuery = new FlowNodeInstanceQuery(); - FlowNodeInstanceQueryList flowNodeInstanceQueryList = new FlowNodeInstanceQueryList(); - flowNodeInstanceQuery.setProcessInstanceId(processInstanceId); - flowNodeInstanceQuery.setTreePath(processInstanceId); - flowNodeInstanceQuery.setPageSize(100); - flowNodeInstanceQueryList.queries=Arrays.asList(flowNodeInstanceQuery); - return flowNodeInstanceQueryList; - } - } -} diff --git a/src/main/java/io/camunda/operate/dto/FlownodeInstance.java b/src/main/java/io/camunda/operate/dto/FlownodeInstance.java deleted file mode 100644 index ce0b649..0000000 --- a/src/main/java/io/camunda/operate/dto/FlownodeInstance.java +++ /dev/null @@ -1,90 +0,0 @@ -package io.camunda.operate.dto; - -import java.util.Date; - -public class FlownodeInstance { - private Long key; - private Long processInstanceKey; - private Long processDefinitionKey; - private Date startDate; - private Date endDate; - private String flowNodeId; - private String flowNodeName; - private Long incidentKey; - private String type; - private FlownodeInstanceState state; - private Boolean incident; - private String tenantId; - public Long getKey() { - return key; - } - public void setKey(Long key) { - this.key = key; - } - public Long getProcessInstanceKey() { - return processInstanceKey; - } - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - public Date getStartDate() { - return startDate; - } - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - public Date getEndDate() { - return endDate; - } - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - public String getFlowNodeId() { - return flowNodeId; - } - public void setFlowNodeId(String flowNodeId) { - this.flowNodeId = flowNodeId; - } - public String getFlowNodeName() { - return flowNodeName; - } - public void setFlowNodeName(String flowNodeName) { - this.flowNodeName = flowNodeName; - } - public Long getIncidentKey() { - return incidentKey; - } - public void setIncidentKey(Long incidentKey) { - this.incidentKey = incidentKey; - } - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public FlownodeInstanceState getState() { - return state; - } - public void setState(FlownodeInstanceState state) { - this.state = state; - } - public Boolean getIncident() { - return incident; - } - public void setIncident(Boolean incident) { - this.incident = incident; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } -} diff --git a/src/main/java/io/camunda/operate/dto/FlownodeInstanceState.java b/src/main/java/io/camunda/operate/dto/FlownodeInstanceState.java deleted file mode 100644 index ef4b0c3..0000000 --- a/src/main/java/io/camunda/operate/dto/FlownodeInstanceState.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.camunda.operate.dto; - -public enum FlownodeInstanceState { - ACTIVE, INCIDENT, COMPLETED, TERMINATED; -} diff --git a/src/main/java/io/camunda/operate/dto/Incident.java b/src/main/java/io/camunda/operate/dto/Incident.java deleted file mode 100644 index 87b2214..0000000 --- a/src/main/java/io/camunda/operate/dto/Incident.java +++ /dev/null @@ -1,62 +0,0 @@ -package io.camunda.operate.dto; - -import java.util.Date; - -public class Incident { - private Long key; - private Long processDefinitionKey; - private Long processInstanceKey; - private String type; - private String message; - private Date creationTime; - private String state; - private String tenantId; - public Long getKey() { - return key; - } - public void setKey(Long key) { - this.key = key; - } - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - public Long getProcessInstanceKey() { - return processInstanceKey; - } - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - public Date getCreationTime() { - return creationTime; - } - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } -} diff --git a/src/main/java/io/camunda/operate/dto/ProcessDefinition.java b/src/main/java/io/camunda/operate/dto/ProcessDefinition.java deleted file mode 100644 index d2a2d00..0000000 --- a/src/main/java/io/camunda/operate/dto/ProcessDefinition.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.camunda.operate.dto; - -public class ProcessDefinition { - private Long key; - private String name; - private Long version; - private String bpmnProcessId; - private String tenantId; - public Long getKey() { - return key; - } - public void setKey(Long key) { - this.key = key; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Long getVersion() { - return version; - } - public void setVersion(Long version) { - this.version = version; - } - public String getBpmnProcessId() { - return bpmnProcessId; - } - public void setBpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } -} diff --git a/src/main/java/io/camunda/operate/dto/ProcessInstance.java b/src/main/java/io/camunda/operate/dto/ProcessInstance.java deleted file mode 100644 index 22f775e..0000000 --- a/src/main/java/io/camunda/operate/dto/ProcessInstance.java +++ /dev/null @@ -1,87 +0,0 @@ -package io.camunda.operate.dto; - -import java.util.Date; - -public class ProcessInstance { - private Long key; - private Long processVersion; - private String bpmnProcessId; - private Long parentKey; - private Date startDate; - private Date endDate; - private ProcessInstanceState state; - private Long processDefinitionKey; - private String tenantId; - - public Long getKey() { - return key; - } - - public void setKey(Long key) { - this.key = key; - } - - public Long getProcessVersion() { - return processVersion; - } - - public void setProcessVersion(Long processVersion) { - this.processVersion = processVersion; - } - - public String getBpmnProcessId() { - return bpmnProcessId; - } - - public void setBpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - } - - public Long getParentKey() { - return parentKey; - } - - public void setParentKey(Long parentKey) { - this.parentKey = parentKey; - } - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public ProcessInstanceState getState() { - return state; - } - - public void setState(ProcessInstanceState state) { - this.state = state; - } - - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } -} diff --git a/src/main/java/io/camunda/operate/dto/ProcessInstanceState.java b/src/main/java/io/camunda/operate/dto/ProcessInstanceState.java deleted file mode 100644 index 3768957..0000000 --- a/src/main/java/io/camunda/operate/dto/ProcessInstanceState.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.camunda.operate.dto; - -public enum ProcessInstanceState { - ACTIVE, COMPLETED, CANCELED; -} diff --git a/src/main/java/io/camunda/operate/dto/SearchResult.java b/src/main/java/io/camunda/operate/dto/SearchResult.java deleted file mode 100644 index fa22933..0000000 --- a/src/main/java/io/camunda/operate/dto/SearchResult.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.camunda.operate.dto; - -import java.util.Iterator; -import java.util.List; - -public class SearchResult implements Iterable{ - - private List items; - - private Integer total; - - private List sortValues; - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public List getSortValues() { - return sortValues; - } - - public void setSortValues(List sortValues) { - this.sortValues = sortValues; - } - - public Iterator iterator() { - return this.items.iterator(); - } -} diff --git a/src/main/java/io/camunda/operate/dto/Variable.java b/src/main/java/io/camunda/operate/dto/Variable.java deleted file mode 100644 index 6a169e3..0000000 --- a/src/main/java/io/camunda/operate/dto/Variable.java +++ /dev/null @@ -1,73 +0,0 @@ -package io.camunda.operate.dto; - -public class Variable { - private Long key; - - private Long processInstanceKey; - - private Long scopeKey; - - private String name; - - private String value; - - private Boolean truncated; - - private String tenantId; - - public Long getKey() { - return key; - } - - public void setKey(Long key) { - this.key = key; - } - - public Long getProcessInstanceKey() { - return processInstanceKey; - } - - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - - public Long getScopeKey() { - return scopeKey; - } - - public void setScopeKey(Long scopeKey) { - this.scopeKey = scopeKey; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public Boolean getTruncated() { - return truncated; - } - - public void setTruncated(Boolean truncated) { - this.truncated = truncated; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } -} diff --git a/src/main/java/io/camunda/operate/exception/OperateException.java b/src/main/java/io/camunda/operate/exception/OperateException.java deleted file mode 100644 index 2e71548..0000000 --- a/src/main/java/io/camunda/operate/exception/OperateException.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.camunda.operate.exception; - -public class OperateException extends Exception { - - /** - * - */ - private static final long serialVersionUID = -7593616210087047797L; - - public OperateException() { - super(); - } - - public OperateException(Exception e) { - super(e); - } - - public OperateException(String message) { - super(message); - } - - public OperateException(String message, Exception e) { - super(message, e); - } -} \ No newline at end of file diff --git a/src/main/java/io/camunda/operate/search/DateFilter.java b/src/main/java/io/camunda/operate/search/DateFilter.java deleted file mode 100644 index bd1cd65..0000000 --- a/src/main/java/io/camunda/operate/search/DateFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.camunda.operate.search; - -import java.util.Date; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -@JsonSerialize(using = DateFilterSerializer.class) -public class DateFilter { - - private Date date; - - private DateFilterRange range; - - public DateFilter(Date date, DateFilterRange range) { - super(); - this.date = date; - this.range = range; - } - - public DateFilter(Date date) { - this(date, DateFilterRange.SECOND); - } - - public DateFilter() { - this(new Date()); - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public DateFilterRange getRange() { - return range; - } - - public void setRange(DateFilterRange range) { - this.range = range; - } - -} diff --git a/src/main/java/io/camunda/operate/search/DateFilterRange.java b/src/main/java/io/camunda/operate/search/DateFilterRange.java deleted file mode 100644 index b49942c..0000000 --- a/src/main/java/io/camunda/operate/search/DateFilterRange.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.camunda.operate.search; - -public enum DateFilterRange { - YEAR("y"), MONTH("M"), WEEK("w"), DAY("d"), HOUR("h"), MINUTE("m"), SECOND("s"); - - private String value; - - DateFilterRange(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - -} diff --git a/src/main/java/io/camunda/operate/search/DateFilterSerializer.java b/src/main/java/io/camunda/operate/search/DateFilterSerializer.java deleted file mode 100644 index 7272d29..0000000 --- a/src/main/java/io/camunda/operate/search/DateFilterSerializer.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.camunda.operate.search; - -import java.io.IOException; -import java.text.SimpleDateFormat; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; - -public class DateFilterSerializer extends StdSerializer { - - public static SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZ"); - - /** - * serial version uid - */ - private static final long serialVersionUID = -8106244922585465120L; - - public DateFilterSerializer() { - super(DateFilter.class); - } - - @Override - public void serialize(DateFilter value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonProcessingException { - - jgen.writeString(isoFormat.format(value.getDate()) + "||/" + value.getRange().getValue()); - } -} \ No newline at end of file diff --git a/src/main/java/io/camunda/operate/search/FlownodeInstanceFilter.java b/src/main/java/io/camunda/operate/search/FlownodeInstanceFilter.java deleted file mode 100644 index faa8c3a..0000000 --- a/src/main/java/io/camunda/operate/search/FlownodeInstanceFilter.java +++ /dev/null @@ -1,183 +0,0 @@ -package io.camunda.operate.search; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -import io.camunda.operate.dto.FlownodeInstanceState; -import io.camunda.operate.exception.OperateException; - -@JsonInclude(Include.NON_NULL) -public class FlownodeInstanceFilter implements Filter { - private Long processInstanceKey; - private Long processDefinitionKey; - private Long incidentKey; - private String type; - private String flowNodeId; - private DateFilter startDate; - private DateFilter endDate; - private FlownodeInstanceState state; - private Boolean incident; - private String flowNodeName; - - public Long getProcessInstanceKey() { - return processInstanceKey; - } - - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - - public Long getIncidentKey() { - return incidentKey; - } - - public void setIncidentKey(Long incidentKey) { - this.incidentKey = incidentKey; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public DateFilter getStartDate() { - return startDate; - } - - public void setStartDate(DateFilter startDate) { - this.startDate = startDate; - } - - public DateFilter getEndDate() { - return endDate; - } - - public void setEndDate(DateFilter endDate) { - this.endDate = endDate; - } - - public String getFlowNodeId() { - return flowNodeId; - } - - public void setFlowNodeId(String flowNodeId) { - this.flowNodeId = flowNodeId; - } - - public FlownodeInstanceState getState() { - return state; - } - - public void setState(FlownodeInstanceState state) { - this.state = state; - } - - public Boolean getIncident() { - return incident; - } - - public void setIncident(Boolean incident) { - this.incident = incident; - } - - public String getFlowNodeName() { - return flowNodeName; - } - - public void setFlowNodeName(String flowNodeName) { - this.flowNodeName = flowNodeName; - } - - public static class Builder { - private Long processInstanceKey; - private Long processDefinitionKey; - private Long incidentKey; - private String type; - private DateFilter startDate; - private DateFilter endDate; - private String flowNodeId; - private FlownodeInstanceState state; - private Boolean incident; - private String flowNodeName; - - public Builder() { - super(); - } - - public Builder processInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - return this; - } - - public Builder processDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - return this; - } - - public Builder incidentKey(Long incidentKey) { - this.incidentKey = incidentKey; - return this; - } - - public Builder type(String type) { - this.type = type; - return this; - } - - public Builder startDate(DateFilter startDate) { - this.startDate = startDate; - return this; - } - - public Builder endDate(DateFilter endDate) { - this.endDate = endDate; - return this; - } - - public Builder flowNodeId(String flowNodeId) { - this.flowNodeId = flowNodeId; - return this; - } - - public Builder state(FlownodeInstanceState state) { - this.state = state; - return this; - } - - public Builder incident(Boolean incident) { - this.incident = incident; - return this; - } - - public Builder flowNodeName(String flowNodeName) { - this.flowNodeName = flowNodeName; - return this; - } - - public FlownodeInstanceFilter build() throws OperateException { - FlownodeInstanceFilter processInstanceFilter = new FlownodeInstanceFilter(); - processInstanceFilter.processInstanceKey = processInstanceKey; - processInstanceFilter.processDefinitionKey = processDefinitionKey; - processInstanceFilter.incidentKey = incidentKey; - processInstanceFilter.type = type; - processInstanceFilter.startDate = startDate; - processInstanceFilter.endDate = endDate; - processInstanceFilter.flowNodeId = flowNodeId; - processInstanceFilter.state = state; - processInstanceFilter.incident = incident; - processInstanceFilter.flowNodeName = flowNodeName; - return processInstanceFilter; - } - } -} diff --git a/src/main/java/io/camunda/operate/search/IncidentFilter.java b/src/main/java/io/camunda/operate/search/IncidentFilter.java deleted file mode 100644 index 94a3fa5..0000000 --- a/src/main/java/io/camunda/operate/search/IncidentFilter.java +++ /dev/null @@ -1,93 +0,0 @@ -package io.camunda.operate.search; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -@JsonInclude(Include.NON_NULL) -public class IncidentFilter implements Filter { - private Long processDefinitionKey; - private Long processInstanceKey; - private String type; - private String message; - private DateFilter creationTime; - private String state; - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - public Long getProcessInstanceKey() { - return processInstanceKey; - } - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } - public DateFilter getCreationTime() { - return creationTime; - } - public void setCreationTime(DateFilter creationTime) { - this.creationTime = creationTime; - } - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - - public static class Builder { - private Long processDefinitionKey; - private Long processInstanceKey; - private String type; - private String message; - private DateFilter creationTime; - private String state; - public Builder processDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - return this; - } - public Builder processInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - return this; - } - public Builder type(String type) { - this.type = type; - return this; - } - public Builder message(String message) { - this.message = message; - return this; - } - public Builder creationTime(DateFilter creationTime) { - this.creationTime = creationTime; - return this; - } - public Builder state(String state) { - this.state = state; - return this; - } - public IncidentFilter build() { - IncidentFilter incidentFilter = new IncidentFilter(); - incidentFilter.processDefinitionKey = processDefinitionKey; - incidentFilter.processInstanceKey = processInstanceKey; - incidentFilter.type = type; - incidentFilter.message = message; - incidentFilter.creationTime = creationTime; - incidentFilter.state = state; - return incidentFilter; - } - } -} diff --git a/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java b/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java deleted file mode 100644 index 661b978..0000000 --- a/src/main/java/io/camunda/operate/search/ProcessDefinitionFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.camunda.operate.search; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -import io.camunda.operate.exception.OperateException; - -@JsonInclude(Include.NON_NULL) -public class ProcessDefinitionFilter implements Filter { - private String name; - private Long version; - private String bpmnProcessId; - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public Long getVersion() { - return version; - } - public void setVersion(Long version) { - this.version = version; - } - public String getBpmnProcessId() { - return bpmnProcessId; - } - public void setBpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - } - - public static class Builder { - private String name; - private Long version; - private String bpmnProcessId; - - public Builder() { - super(); - } - - public Builder name(String name) { - this.name = name; - return this; - } - - public Builder version(Long version) { - this.version = version; - return this; - } - - public Builder bpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - return this; - } - - public ProcessDefinitionFilter build() throws OperateException { - ProcessDefinitionFilter processDefinitionFilter = new ProcessDefinitionFilter(); - processDefinitionFilter.name = name; - processDefinitionFilter.version = version; - processDefinitionFilter.bpmnProcessId = bpmnProcessId; - return processDefinitionFilter; - } - } -} diff --git a/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java b/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java deleted file mode 100644 index a118358..0000000 --- a/src/main/java/io/camunda/operate/search/ProcessInstanceFilter.java +++ /dev/null @@ -1,151 +0,0 @@ -package io.camunda.operate.search; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -import io.camunda.operate.dto.ProcessInstanceState; -import io.camunda.operate.exception.OperateException; - -@JsonInclude(Include.NON_NULL) -public class ProcessInstanceFilter implements Filter { - private Long processVersion; - private String bpmnProcessId; - private Long parentKey; - private Long parentProcessInstanceKey; - private DateFilter startDate; - private DateFilter endDate; - private ProcessInstanceState state; - private Long processDefinitionKey; - - public Long getProcessVersion() { - return processVersion; - } - - public void setProcessVersion(Long processVersion) { - this.processVersion = processVersion; - } - - public String getBpmnProcessId() { - return bpmnProcessId; - } - - public void setBpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - } - - public Long getParentKey() { - return parentKey; - } - - public void setParentKey(Long parentKey) { - this.parentKey = parentKey; - } - - public Long getParentProcessInstanceKey() { - return parentProcessInstanceKey; - } - - public void setParentProcessInstanceKey(Long parentProcessInstanceKey) { - this.parentProcessInstanceKey = parentProcessInstanceKey; - } - - public DateFilter getStartDate() { - return startDate; - } - - public void setStartDate(DateFilter startDate) { - this.startDate = startDate; - } - - public DateFilter getEndDate() { - return endDate; - } - - public void setEndDate(DateFilter endDate) { - this.endDate = endDate; - } - - public ProcessInstanceState getState() { - return state; - } - - public void setState(ProcessInstanceState state) { - this.state = state; - } - - public Long getProcessDefinitionKey() { - return processDefinitionKey; - } - - public void setProcessDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - } - - public static class Builder { - private Long processVersion; - private String bpmnProcessId; - private Long parentKey; - private Long parentProcessInstanceKey; - private DateFilter startDate; - private DateFilter endDate; - private ProcessInstanceState state; - private Long processDefinitionKey; - - public Builder() { - super(); - } - - public Builder processVersion(Long processVersion) { - this.processVersion = processVersion; - return this; - } - - public Builder bpmnProcessId(String bpmnProcessId) { - this.bpmnProcessId = bpmnProcessId; - return this; - } - - public Builder parentKey(Long parentKey) { - this.parentKey = parentKey; - return this; - } - - public Builder parentProcessInstanceKey(Long parentProcessInstanceKey) { - this.parentProcessInstanceKey = parentProcessInstanceKey; - return this; - } - - public Builder startDate(DateFilter startDate) { - this.startDate = startDate; - return this; - } - - public Builder endDate(DateFilter endDate) { - this.endDate = endDate; - return this; - } - - public Builder state(ProcessInstanceState state) { - this.state = state; - return this; - } - - public Builder processDefinitionKey(Long processDefinitionKey) { - this.processDefinitionKey = processDefinitionKey; - return this; - } - - public ProcessInstanceFilter build() throws OperateException { - ProcessInstanceFilter processInstanceFilter = new ProcessInstanceFilter(); - processInstanceFilter.processVersion = processVersion; - processInstanceFilter.bpmnProcessId = bpmnProcessId; - processInstanceFilter.parentKey = parentKey; - processInstanceFilter.startDate = startDate; - processInstanceFilter.endDate = endDate; - processInstanceFilter.state = state; - processInstanceFilter.processDefinitionKey = processDefinitionKey; - processInstanceFilter.parentProcessInstanceKey = parentProcessInstanceKey; - return processInstanceFilter; - } - } -} diff --git a/src/main/java/io/camunda/operate/search/SearchQuery.java b/src/main/java/io/camunda/operate/search/SearchQuery.java deleted file mode 100644 index f8a97f8..0000000 --- a/src/main/java/io/camunda/operate/search/SearchQuery.java +++ /dev/null @@ -1,106 +0,0 @@ -package io.camunda.operate.search; - -import java.util.ArrayList; -import java.util.List; - -import io.camunda.operate.exception.OperateException; - -public class SearchQuery { - private Filter filter; - private Integer size; - private List sort; - private List searchAfter; - - public Filter getFilter() { - return filter; - } - - public void setFilter(Filter filter) { - this.filter = filter; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } - - public List getSort() { - return sort; - } - - public void setSort(List sort) { - this.sort = sort; - } - - public List getSearchAfter() { - return searchAfter; - } - - public void setSearchAfter(List searchAfter) { - this.searchAfter = searchAfter; - } - - public static class Builder { - - private Filter filter; - private Integer size; - private List sorts = new ArrayList<>(); - private List searchAfter=null; - - public Builder() { - - } - - @Deprecated - public Builder withFilter(Filter filter) { - this.filter = filter; - return this; - } - - public Builder filter(Filter filter) { - this.filter = filter; - return this; - } - - @Deprecated - public Builder withSize(Integer size) { - this.size = size; - return this; - } - - public Builder size(Integer size) { - this.size = size; - return this; - } - - @Deprecated - public Builder withSort(Sort sort) { - this.sorts.add(sort); - return this; - } - - public Builder sort(Sort sort) { - this.sorts.add(sort); - return this; - } - - public Builder searchAfter(List searchAfter) { - this.searchAfter=searchAfter; - return this; - } - - public SearchQuery build() throws OperateException { - SearchQuery query = new SearchQuery(); - query.filter = filter; - query.size = size; - query.searchAfter = searchAfter; - if (!sorts.isEmpty()) { - query.setSort(sorts); - } - return query; - } - } -} diff --git a/src/main/java/io/camunda/operate/search/Sort.java b/src/main/java/io/camunda/operate/search/Sort.java deleted file mode 100644 index b41292c..0000000 --- a/src/main/java/io/camunda/operate/search/Sort.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.camunda.operate.search; - -public class Sort { - - private String field; - - private SortOrder order; - - public Sort() { - super(); - } - - public Sort(String field, SortOrder order) { - super(); - this.field = field; - this.order = order; - } - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - - public SortOrder getOrder() { - return order; - } - - public void setOrder(SortOrder order) { - this.order = order; - } - -} diff --git a/src/main/java/io/camunda/operate/search/VariableFilter.java b/src/main/java/io/camunda/operate/search/VariableFilter.java deleted file mode 100644 index 73661a5..0000000 --- a/src/main/java/io/camunda/operate/search/VariableFilter.java +++ /dev/null @@ -1,87 +0,0 @@ -package io.camunda.operate.search; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - -import io.camunda.operate.exception.OperateException; - -@JsonInclude(Include.NON_NULL) -public class VariableFilter implements Filter { - - private Long processInstanceKey; - private String name; - private String value; - private Long scopeKey; - - public Long getProcessInstanceKey() { - return processInstanceKey; - } - - public void setProcessInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public Long getScopeKey() { - return scopeKey; - } - - public void setScopeKey(Long scopeKey) { - this.scopeKey = scopeKey; - } - - public static class Builder { - private Long processInstanceKey; - private String name; - private String value; - private Long scopeKey; - - public Builder() { - super(); - } - - public Builder processInstanceKey(Long processInstanceKey) { - this.processInstanceKey = processInstanceKey; - return this; - } - - public Builder name(String name) { - this.name = name; - return this; - } - - public Builder value(String value) { - this.value = value; - return this; - } - - public Builder scopeKey(Long scopeKey) { - this.scopeKey = scopeKey; - return this; - } - - public VariableFilter build() throws OperateException { - VariableFilter variableFilter = new VariableFilter(); - variableFilter.processInstanceKey = processInstanceKey; - variableFilter.name = name; - variableFilter.value = value; - variableFilter.scopeKey = scopeKey; - return variableFilter; - } - } -} diff --git a/src/main/java/io/camunda/operate/util/Java8Utils.java b/src/main/java/io/camunda/operate/util/Java8Utils.java deleted file mode 100644 index af34838..0000000 --- a/src/main/java/io/camunda/operate/util/Java8Utils.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.camunda.operate.util; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.AbstractMap; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class Java8Utils { - - private Java8Utils() { - - } - - public static byte[] readAllBytes(InputStream inputStream) throws IOException { - final int bufLen = 4 * 0x400; // 4KB - byte[] buf = new byte[bufLen]; - int readLen; - IOException exception = null; - - try { - try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { - while ((readLen = inputStream.read(buf, 0, bufLen)) != -1) - outputStream.write(buf, 0, readLen); - - return outputStream.toByteArray(); - } - } catch (IOException e) { - exception = e; - throw e; - } finally { - if (exception == null) inputStream.close(); - else try { - inputStream.close(); - } catch (IOException e) { - exception.addSuppressed(e); - } - } - } - - public static Map, String> toMap(Object... array) { - AbstractMap.SimpleEntry, String>[] entryArray = new AbstractMap.SimpleEntry[array.length/2]; - for(int i=0;i, String>((Class)array[i*2], (String) array[i*2+1]); - } - return Stream.of(entryArray) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - } -} diff --git a/src/main/java/io/camunda/operate/util/JsonUtils.java b/src/main/java/io/camunda/operate/util/JsonUtils.java deleted file mode 100644 index da6a1c7..0000000 --- a/src/main/java/io/camunda/operate/util/JsonUtils.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.camunda.operate.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.*; - -import io.camunda.operate.dto.SearchResult; - -public class JsonUtils { - - private JsonUtils() { - } - - private static ObjectMapper mapper; - - private static Map, JavaType> searchResultTypeMap = new HashMap<>(); - - private static ObjectMapper getObjectMapper() { - if (mapper == null) { - mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - } - return mapper; - } - - public static JsonNode toJsonNode(InputStream is) throws IOException { - return getObjectMapper().readTree(is); - } - - public static JsonNode toJsonNode(String json) throws IOException { - return getObjectMapper().readTree(json); - } - - public static String toJson(Object object) throws IOException { - return getObjectMapper().writeValueAsString(object); - } - - public static T toResult(String json, Class resultType) throws IOException { - return getObjectMapper().readValue(json, resultType); - } - - public static SearchResult toSearchResult(String json, Class resultType) throws IOException { - return getObjectMapper().readValue(json, getSearchResultType(resultType)); - } - - private static JavaType getSearchResultType(Class resultType) { - if (!searchResultTypeMap.containsKey(resultType)) { - searchResultTypeMap.put(resultType, - getObjectMapper().getTypeFactory().constructParametricType(SearchResult.class, resultType)); - } - return searchResultTypeMap.get(resultType); - } - -} diff --git a/src/main/java/io/camunda/operate/util/QueryValidatorUtils.java b/src/main/java/io/camunda/operate/util/QueryValidatorUtils.java deleted file mode 100644 index 643bd7c..0000000 --- a/src/main/java/io/camunda/operate/util/QueryValidatorUtils.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.camunda.operate.util; - -import java.util.HashMap; -import java.util.Map; - -import io.camunda.operate.dto.FlownodeInstance; -import io.camunda.operate.dto.Incident; -import io.camunda.operate.dto.ProcessDefinition; -import io.camunda.operate.dto.ProcessInstance; -import io.camunda.operate.dto.Variable; -import io.camunda.operate.exception.OperateException; -import io.camunda.operate.search.FlownodeInstanceFilter; -import io.camunda.operate.search.IncidentFilter; -import io.camunda.operate.search.ProcessDefinitionFilter; -import io.camunda.operate.search.ProcessInstanceFilter; -import io.camunda.operate.search.SearchQuery; -import io.camunda.operate.search.VariableFilter; - -public class QueryValidatorUtils { - - private static Map, Class> TYPE_FILTERS = new HashMap<>(); - - private QueryValidatorUtils() { - } - - private static Class getFilterClass(Class resultType) { - if (TYPE_FILTERS.isEmpty()) { - TYPE_FILTERS.put(ProcessDefinition.class, ProcessDefinitionFilter.class); - TYPE_FILTERS.put(ProcessInstance.class, ProcessInstanceFilter.class); - TYPE_FILTERS.put(FlownodeInstance.class, FlownodeInstanceFilter.class); - TYPE_FILTERS.put(Incident.class, IncidentFilter.class); - TYPE_FILTERS.put(Variable.class, VariableFilter.class); - } - return TYPE_FILTERS.get(resultType); - } - - public static void verifyQuery(SearchQuery query, Class resultType) throws OperateException { - if (query.getFilter() != null && query.getFilter().getClass() != getFilterClass(resultType)) { - throw new OperateException( - "You should rely on "+TYPE_FILTERS.get(resultType).getSimpleName()+" for searching on "+resultType.getSimpleName()); - } - } -} From 477513a06429e2981096699f40beea8b14f1ca97 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Wed, 19 Jun 2024 06:37:41 +0200 Subject: [PATCH 2/9] remove push build from build workflow --- .github/workflows/mvn-build.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/mvn-build.yml b/.github/workflows/mvn-build.yml index 16be156..c907003 100644 --- a/.github/workflows/mvn-build.yml +++ b/.github/workflows/mvn-build.yml @@ -1,23 +1,17 @@ name: Build via Maven and run tests -on: [push, pull_request] +on: [pull_request] jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Cache - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set up JDK + - name: Set up Java environment uses: actions/setup-java@v4 with: java-version: '21' distribution: 'adopt' + cache: maven - name: Build with Maven run: mvn verify -PcheckFormat -B From 158ee897cd67881bb58cd223102fdb2d499e7bd2 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Tue, 25 Jun 2024 07:44:17 +0200 Subject: [PATCH 3/9] added tests --- .../operate/model/ProcessInstance.java | 9 +++++ .../pom.xml | 5 +++ .../src/main/resources/application.yaml | 0 ...onfigurationPropertiesProfileOidcTest.java | 33 ++++++++++++++++++ ...onfigurationPropertiesProfileSaasTest.java | 34 +++++++++++++++++++ ...figurationPropertiesProfileSimpleTest.java | 26 ++++++++++++++ .../io/camunda/operate/spring/TestApp.java | 11 ++++++ 7 files changed, 118 insertions(+) delete mode 100644 extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml create mode 100644 extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileOidcTest.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSaasTest.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSimpleTest.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/TestApp.java diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java index 935761f..10842f6 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ProcessInstance.java @@ -7,6 +7,7 @@ public class ProcessInstance { private Long processVersion; private String bpmnProcessId; private Long parentKey; + private Long parentFlowNodeInstanceKey; private Date startDate; private Date endDate; private ProcessInstanceState state; @@ -45,6 +46,14 @@ public void setParentKey(Long parentKey) { this.parentKey = parentKey; } + public Long getParentFlowNodeInstanceKey() { + return parentFlowNodeInstanceKey; + } + + public void setParentFlowNodeInstanceKey(Long parentFlowNodeInstanceKey) { + this.parentFlowNodeInstanceKey = parentFlowNodeInstanceKey; + } + public Date getStartDate() { return startDate; } diff --git a/extension/spring-boot-starter-camunda-operate/pom.xml b/extension/spring-boot-starter-camunda-operate/pom.xml index f76a019..57e3a4d 100644 --- a/extension/spring-boot-starter-camunda-operate/pom.xml +++ b/extension/spring-boot-starter-camunda-operate/pom.xml @@ -20,6 +20,11 @@ io.camunda.spring java-client-operate + + org.springframework.boot + spring-boot-starter-test + test + \ No newline at end of file diff --git a/extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml b/extension/spring-boot-starter-camunda-operate/src/main/resources/application.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileOidcTest.java b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileOidcTest.java new file mode 100644 index 0000000..46e93ba --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileOidcTest.java @@ -0,0 +1,33 @@ +package io.camunda.operate.spring; + +import static io.camunda.operate.spring.OperateClientConfigurationProperties.Profile.*; +import static org.assertj.core.api.Assertions.*; + +import java.net.MalformedURLException; +import java.net.URI; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest( + properties = { + "operate.client.profile=oidc", + "operate.client.client-id=def", + "operate.client.client-secret=ghi" + }) +public class OperateClientConfigurationPropertiesProfileOidcTest { + @Autowired OperateClientConfigurationProperties properties; + + @Test + void shouldApplyProfiles() throws MalformedURLException { + assertThat(properties.profile()).isEqualTo(oidc); + assertThat(properties.clientId()).isEqualTo("def"); + assertThat(properties.clientSecret()).isEqualTo("ghi"); + assertThat(properties.baseUrl()).isEqualTo(URI.create("http://localhost:8081").toURL()); + assertThat(properties.enabled()).isEqualTo(true); + assertThat(properties.authUrl()) + .isEqualTo( + URI.create("http://localhost:18080/auth/realms/camunda-platform/openid-connect/token") + .toURL()); + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSaasTest.java b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSaasTest.java new file mode 100644 index 0000000..17bb0d2 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSaasTest.java @@ -0,0 +1,34 @@ +package io.camunda.operate.spring; + +import static io.camunda.operate.spring.OperateClientConfigurationProperties.Profile.*; +import static org.assertj.core.api.Assertions.*; + +import java.net.MalformedURLException; +import java.net.URI; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest( + properties = { + "operate.client.profile=saas", + "operate.client.cluster-id=abc", + "operate.client.region=bru-2", + "operate.client.client-id=def", + "operate.client.client-secret=ghi" + }) +public class OperateClientConfigurationPropertiesProfileSaasTest { + @Autowired OperateClientConfigurationProperties properties; + + @Test + void shouldApplyProfiles() throws MalformedURLException { + assertThat(properties.profile()).isEqualTo(saas); + assertThat(properties.clientId()).isEqualTo("def"); + assertThat(properties.clientSecret()).isEqualTo("ghi"); + assertThat(properties.baseUrl()) + .isEqualTo(URI.create("https://bru-2.operate.camunda.io/abc").toURL()); + assertThat(properties.enabled()).isEqualTo(true); + assertThat(properties.authUrl()) + .isEqualTo(URI.create("https://login.cloud.camunda.io/oauth/token").toURL()); + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSimpleTest.java b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSimpleTest.java new file mode 100644 index 0000000..817a1a4 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/OperateClientConfigurationPropertiesProfileSimpleTest.java @@ -0,0 +1,26 @@ +package io.camunda.operate.spring; + +import static io.camunda.operate.spring.OperateClientConfigurationProperties.Profile.*; +import static org.assertj.core.api.Assertions.*; + +import java.net.MalformedURLException; +import java.net.URI; +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest(properties = {"operate.client.profile=simple"}) +public class OperateClientConfigurationPropertiesProfileSimpleTest { + @Autowired OperateClientConfigurationProperties properties; + + @Test + void shouldApplyProfiles() throws MalformedURLException { + assertThat(properties.profile()).isEqualTo(simple); + assertThat(properties.username()).isEqualTo("demo"); + assertThat(properties.password()).isEqualTo("demo"); + assertThat(properties.baseUrl()).isEqualTo(URI.create("http://localhost:8081").toURL()); + assertThat(properties.enabled()).isEqualTo(true); + assertThat(properties.sessionTimeout()).isEqualTo(Duration.ofMinutes(10)); + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/TestApp.java b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/TestApp.java new file mode 100644 index 0000000..57478a7 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/test/java/io/camunda/operate/spring/TestApp.java @@ -0,0 +1,11 @@ +package io.camunda.operate.spring; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestApp { + public static void main(String[] args) { + SpringApplication.run(TestApp.class, args); + } +} From 8a39b682adb2970cd9005958deec57e4ebe47515 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Thu, 4 Jul 2024 16:34:05 +0200 Subject: [PATCH 4/9] wip: cleaned up, removed dependencies to more stuff --- .../README.md | 17 ++ .../pom.xml | 25 ++ .../camunda/operate/example/ExampleApp.java | 11 + .../example/ProcessInstanceController.java | 67 +++++ .../src/main/resources/application.yaml | 3 + examples/pom.xml | 18 ++ extension/java-client-operate/pom.xml | 11 - .../camunda/operate/CamundaOperateClient.java | 135 ++++------ .../camunda/operate/auth/Authentication.java | 2 +- .../auth/DefaultNoopAuthentication.java | 2 +- .../operate/auth/JwtAuthentication.java | 15 +- .../operate/auth/SimpleAuthentication.java | 56 ++-- .../operate/auth/TokenResponseParser.java | 25 ++ .../operate/http/DefaultHttpClient.java | 251 +++++------------- .../io/camunda/operate/http/HttpClient.java | 16 +- ...ypeReferenceHttpClientResponseHandler.java | 41 +++ .../camunda/operate/model/TypeReferences.java | 30 +++ .../operate/http/DefaultHttpClientTest.java | 68 ++--- ...eferenceHttpClientResponseHandlerTest.java | 68 +++++ .../operate/http/TypeReferenceTest.java | 25 ++ extension/pom.xml | 12 - .../spring/ObjectMapperConfiguration.java | 16 ++ .../spring/OperateClientConfiguration.java | 22 +- pom.xml | 43 +-- 24 files changed, 569 insertions(+), 410 deletions(-) create mode 100644 examples/operate-example-load-process-instance/README.md create mode 100644 examples/operate-example-load-process-instance/pom.xml create mode 100644 examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ExampleApp.java create mode 100644 examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ProcessInstanceController.java create mode 100644 examples/operate-example-load-process-instance/src/main/resources/application.yaml create mode 100644 examples/pom.xml create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandler.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/TypeReferences.java create mode 100644 extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandlerTest.java create mode 100644 extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceTest.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/ObjectMapperConfiguration.java diff --git a/examples/operate-example-load-process-instance/README.md b/examples/operate-example-load-process-instance/README.md new file mode 100644 index 0000000..d6d29f7 --- /dev/null +++ b/examples/operate-example-load-process-instance/README.md @@ -0,0 +1,17 @@ +# Example: Load process instances + +This example allows you to load process instances plus dependant data from Operate via REST API. + +## Configuration + +Configure the Operate client as desired. Then, you can run the application and get process instances via + +``` +GET /process-instances +``` + +Also, you can delete process instances using + +``` +DELETE /process-instances/{key} +``` diff --git a/examples/operate-example-load-process-instance/pom.xml b/examples/operate-example-load-process-instance/pom.xml new file mode 100644 index 0000000..2526f73 --- /dev/null +++ b/examples/operate-example-load-process-instance/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + io.camunda.spring + operate-examples-parent + 8.6.0-alpha1-SNAPSHOT + + + operate-example-load-process-instance + + + + org.springframework.boot + spring-boot-starter-web + + + io.camunda.spring + spring-boot-starter-camunda-operate + + + + \ No newline at end of file diff --git a/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ExampleApp.java b/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ExampleApp.java new file mode 100644 index 0000000..fa0737c --- /dev/null +++ b/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ExampleApp.java @@ -0,0 +1,11 @@ +package io.camunda.operate.example; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ExampleApp { + public static void main(String[] args) { + SpringApplication.run(ExampleApp.class, args); + } +} diff --git a/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ProcessInstanceController.java b/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ProcessInstanceController.java new file mode 100644 index 0000000..a8b4130 --- /dev/null +++ b/examples/operate-example-load-process-instance/src/main/java/io/camunda/operate/example/ProcessInstanceController.java @@ -0,0 +1,67 @@ +package io.camunda.operate.example; + +import io.camunda.operate.CamundaOperateClient; +import io.camunda.operate.exception.OperateException; +import io.camunda.operate.model.ChangeStatus; +import io.camunda.operate.model.FlowNodeInstance; +import io.camunda.operate.model.ProcessInstance; +import io.camunda.operate.model.Variable; +import io.camunda.operate.search.FlowNodeInstanceFilter; +import io.camunda.operate.search.SearchQuery; +import io.camunda.operate.search.VariableFilter; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/process-instances") +public class ProcessInstanceController { + private final CamundaOperateClient camundaOperateClient; + + @Autowired + public ProcessInstanceController(CamundaOperateClient camundaOperateClient) { + this.camundaOperateClient = camundaOperateClient; + } + + @GetMapping + public List getProcessInstances() throws OperateException { + return camundaOperateClient.searchProcessInstances(new SearchQuery.Builder().build()).stream() + .map( + pi -> { + try { + return new ProcessInstanceWrapper( + pi, + camundaOperateClient.searchFlowNodeInstances( + new SearchQuery.Builder() + .filter( + FlowNodeInstanceFilter.builder() + .processInstanceKey(pi.getKey()) + .build()) + .build()), + camundaOperateClient.searchVariables( + new SearchQuery.Builder() + .filter( + VariableFilter.builder().processInstanceKey(pi.getKey()).build()) + .build())); + } catch (OperateException e) { + throw new RuntimeException(e); + } + }) + .toList(); + } + + @DeleteMapping("/{key}") + public ChangeStatus deleteProcessInstance(@PathVariable(name = "key") Long key) + throws OperateException { + return camundaOperateClient.deleteProcessInstance(key); + } + + public record ProcessInstanceWrapper( + ProcessInstance processInstance, + List flowNodeInstances, + List variables) {} +} diff --git a/examples/operate-example-load-process-instance/src/main/resources/application.yaml b/examples/operate-example-load-process-instance/src/main/resources/application.yaml new file mode 100644 index 0000000..89ec0fe --- /dev/null +++ b/examples/operate-example-load-process-instance/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +operate: + client: + profile: simple \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml new file mode 100644 index 0000000..456b210 --- /dev/null +++ b/examples/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + io.camunda.spring + operate-client-root + 8.6.0-alpha1-SNAPSHOT + + + operate-examples-parent + pom + + operate-example-load-process-instance + + + \ No newline at end of file diff --git a/extension/java-client-operate/pom.xml b/extension/java-client-operate/pom.xml index 823b445..2b70848 100644 --- a/extension/java-client-operate/pom.xml +++ b/extension/java-client-operate/pom.xml @@ -14,42 +14,31 @@ io.camunda zeebe-bpmn-model - - io.camunda - spring-boot-starter-camunda-sdk - 8.5.3 - org.apache.httpcomponents.client5 httpclient5 - 5.3.1 com.fasterxml.jackson.core jackson-databind - 2.17.1 com.google.guava guava - 33.2.1-jre org.junit.jupiter junit-jupiter - 5.10.2 test org.mockito mockito-core - 5.12.0 test org.mockito mockito-junit-jupiter - 5.12.0 test diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java index 88bf79e..596c78e 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java @@ -1,5 +1,8 @@ package io.camunda.operate; +import static io.camunda.operate.model.TypeReferences.*; + +import com.fasterxml.jackson.core.type.TypeReference; import io.camunda.operate.exception.OperateException; import io.camunda.operate.http.DefaultHttpClient; import io.camunda.operate.http.HttpClient; @@ -30,34 +33,37 @@ private static HttpClient buildOperateHttpClient( HttpClient httpClient = new DefaultHttpClient(configuration.authentication()); httpClient.init(formatUrl(configuration.baseUrl().toString()), "/v1"); // load the config map - Map, String> map = new HashMap<>(); - map.put(ProcessInstance.class, "/process-instances"); - map.put(ListTypeToken.listFlowNodeStatistics.getClass(), "/process-instances/{key}/statistics"); - map.put(ListTypeToken.listSequenceFlows.getClass(), "/process-instances/{key}/sequence-flows"); - map.put(ProcessDefinition.class, "/process-definitions"); - map.put(FlowNodeInstance.class, "/flownode-instances"); - map.put(Incident.class, "/incidents"); - map.put(Variable.class, "/variables"); - map.put(DecisionDefinition.class, "/decision-definitions"); - map.put(DecisionRequirements.class, "/drd"); - map.put(DecisionInstance.class, "/decision-instances"); - map.put( - SearchResultTypeToken.searchResultProcessDefinition.getClass(), - "/process-definitions/search"); - map.put( - SearchResultTypeToken.searchResultDecisionDefinition.getClass(), - "/decision-definitions/search"); - map.put( - SearchResultTypeToken.searchResultDecisionInstance.getClass(), - "/decision-instances/search"); - map.put( - SearchResultTypeToken.searchResultFlowNodeInstance.getClass(), - "/flownode-instances/search"); - map.put(SearchResultTypeToken.searchResultVariable.getClass(), "/variables/search"); - map.put( - SearchResultTypeToken.searchResultProcessInstance.getClass(), "/process-instances/search"); - map.put(SearchResultTypeToken.searchResultDecisionRequirements.getClass(), "/drd/search"); - map.put(SearchResultTypeToken.searchResultIncident.getClass(), "/incidents/search"); + Map, String> map = new HashMap<>(); + // process definitions + map.put(searchProcessDefinition, "/process-definitions/search"); + map.put(processDefinition, "/process-definitions/{key}"); + map.put(processDefinitionXml, "/process-definitions/{key}/xml"); + // decision definition + map.put(searchDecisionDefinition, "/decision-definitions/search"); + map.put(decisionDefinition, "/decision-definitions/{key}"); + // decision instance + map.put(searchDecisionInstance, "/decision-instances/search"); + map.put(decisionInstance, "/decision-instances/{id}"); + // flownode instance + map.put(searchFlowNodeInstance, "/flownode-instances/search"); + map.put(flowNodeInstance, "/flownode-instances/{key}"); + // variable + map.put(searchVariable, "/variables/search"); + map.put(variable, "/variables/{key}"); + // process instances + map.put(searchProcessInstance, "/process-instances/search"); + map.put(processInstance, "/process-instances/{key}"); + map.put(deleteProcessInstance, "/process-instances/{key}"); + map.put(flownodeStatistics, "/process-instances/{key}/statistics"); + map.put(sequenceFlows, "/process-instances/{key}/sequence-flows"); + // decision requirements + map.put(searchDecisionRequirements, "/drd/search"); + map.put(decisionRequirements, "/drd/{key}"); + map.put(decisionRequirementsXml, "/drd/{key}/xml"); + // incident + map.put(searchIncident, "/incidents/search"); + map.put(incident, "/incidents/{key}"); + httpClient.loadMap(map); return httpClient; } @@ -70,7 +76,7 @@ private static String formatUrl(String url) { } public ProcessDefinition getProcessDefinition(Long key) throws OperateException { - return httpClient.get(ProcessDefinition.class, key); + return httpClient.get(processDefinition, key(key)); } public BpmnModelInstance getProcessDefinitionModel(Long key) throws OperateException { @@ -84,7 +90,7 @@ public BpmnModelInstance getProcessDefinitionModel(Long key) throws OperateExcep } public String getProcessDefinitionXml(Long key) throws OperateException { - return httpClient.getXml(ProcessDefinition.class, key); + return httpClient.get(processDefinitionXml, key(key)); } public List searchProcessDefinitions(SearchQuery query) @@ -94,11 +100,7 @@ public List searchProcessDefinitions(SearchQuery query) public SearchResult searchProcessDefinitionResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - ProcessDefinition.class, - SearchResultTypeToken.searchResultProcessDefinition, - query); + return httpClient.post(searchProcessDefinition, query); } public List searchDecisionDefinitions(SearchQuery query) @@ -108,11 +110,7 @@ public List searchDecisionDefinitions(SearchQuery query) public SearchResult searchDecisionDefinitionResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - DecisionDefinition.class, - SearchResultTypeToken.searchResultDecisionDefinition, - query); + return httpClient.post(searchDecisionDefinition, query); } public List searchDecisionInstances(SearchQuery query) throws OperateException { @@ -121,11 +119,7 @@ public List searchDecisionInstances(SearchQuery query) throws public SearchResult searchDecisionInstanceResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - DecisionInstance.class, - SearchResultTypeToken.searchResultDecisionInstance, - query); + return httpClient.post(searchDecisionInstance, query); } public List searchFlowNodeInstances(SearchQuery query) throws OperateException { @@ -134,11 +128,7 @@ public List searchFlowNodeInstances(SearchQuery query) throws public SearchResult searchFlowNodeInstanceResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - FlowNodeInstance.class, - SearchResultTypeToken.searchResultFlowNodeInstance, - query); + return httpClient.post(searchFlowNodeInstance, query); } public List searchVariables(SearchQuery query) throws OperateException { @@ -146,8 +136,7 @@ public List searchVariables(SearchQuery query) throws OperateException } public SearchResult searchVariableResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, Variable.class, SearchResultTypeToken.searchResultVariable, query); + return httpClient.post(searchVariable, query); } public List searchProcessInstances(SearchQuery query) throws OperateException { @@ -156,11 +145,7 @@ public List searchProcessInstances(SearchQuery query) throws Op public SearchResult searchProcessInstanceResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - ProcessInstance.class, - SearchResultTypeToken.searchResultProcessInstance, - query); + return httpClient.post(searchProcessInstance, query); } public List searchDecisionRequirements(SearchQuery query) @@ -170,11 +155,7 @@ public List searchDecisionRequirements(SearchQuery query) public SearchResult searchDecisionRequirementsResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, - DecisionRequirements.class, - SearchResultTypeToken.searchResultDecisionRequirements, - query); + return httpClient.post(searchDecisionRequirements, query); } public List searchIncidents(SearchQuery query) throws OperateException { @@ -182,52 +163,54 @@ public List searchIncidents(SearchQuery query) throws OperateException } public SearchResult searchIncidentResults(SearchQuery query) throws OperateException { - return httpClient.post( - SearchResult.class, Incident.class, SearchResultTypeToken.searchResultIncident, query); + return httpClient.post(searchIncident, query); } public ProcessInstance getProcessInstance(Long key) throws OperateException { - return httpClient.get(ProcessInstance.class, key); + return httpClient.get(processInstance, Map.of("key", String.valueOf(key))); } public ChangeStatus deleteProcessInstance(Long key) throws OperateException { - return httpClient.delete(ChangeStatus.class, ProcessInstance.class, key); + return httpClient.delete(deleteProcessInstance, key(key)); } public List getFlowNodeStatistics(Long key) throws OperateException { - return httpClient.get( - List.class, FlowNodeStatistics.class, ListTypeToken.listFlowNodeStatistics, key); + return httpClient.get(flownodeStatistics, key(key)); } public List getSequenceFlows(Long key) throws OperateException { - return httpClient.get(List.class, String.class, ListTypeToken.listSequenceFlows, key); + return httpClient.get(sequenceFlows, key(key)); } public FlowNodeInstance getFlowNodeInstance(Long key) throws OperateException { - return httpClient.get(FlowNodeInstance.class, key); + return httpClient.get(flowNodeInstance, key(key)); } public Incident getIncident(Long key) throws OperateException { - return httpClient.get(Incident.class, key); + return httpClient.get(incident, key(key)); } public DecisionDefinition getDecisionDefinition(Long key) throws OperateException { - return httpClient.get(DecisionDefinition.class, key); + return httpClient.get(decisionDefinition, key(key)); } public DecisionRequirements getDecisionRequirements(Long key) throws OperateException { - return httpClient.get(DecisionRequirements.class, key); + return httpClient.get(decisionRequirements, key(key)); } public String getDecisionRequirementsXml(Long key) throws OperateException { - return httpClient.getXml(DecisionRequirements.class, key); + return httpClient.get(decisionRequirementsXml, key(key)); } public DecisionInstance getDecisionInstance(String id) throws OperateException { - return httpClient.get(DecisionInstance.class, id); + return httpClient.get(decisionInstance, Map.of("id", id)); } public Variable getVariable(Long key) throws OperateException { - return httpClient.get(Variable.class, key); + return httpClient.get(variable, key(key)); + } + + private Map key(Long key) { + return Map.of("key", String.valueOf(key)); } } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java index f49ae1b..c2c4aa6 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/Authentication.java @@ -4,7 +4,7 @@ public interface Authentication { - Map.Entry getTokenHeader(); + Map getTokenHeader(); void resetToken(); } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java index 34dc184..34260cc 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/DefaultNoopAuthentication.java @@ -27,7 +27,7 @@ public void resetToken() { } @Override - public Map.Entry getTokenHeader() { + public Map getTokenHeader() { throw new UnsupportedOperationException("Unable to determine authentication"); } } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java index 59219ed..6a30dc9 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java @@ -1,11 +1,9 @@ package io.camunda.operate.auth; -import io.camunda.common.json.JsonMapper; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; @@ -16,23 +14,23 @@ public class JwtAuthentication implements Authentication { private final JwtCredential jwtCredential; - private final JsonMapper jsonMapper; + private final TokenResponseParser tokenResponseParser; private String token; private LocalDateTime timeout; - public JwtAuthentication(JwtCredential jwtCredential, JsonMapper jsonMapper) { + public JwtAuthentication(JwtCredential jwtCredential, TokenResponseParser tokenResponseParser) { this.jwtCredential = jwtCredential; - this.jsonMapper = jsonMapper; + this.tokenResponseParser = tokenResponseParser; } @Override - public Entry getTokenHeader() { + public Map getTokenHeader() { if (token == null || timeout == null || timeout.isBefore(LocalDateTime.now())) { TokenResponse response = retrieveToken(); token = response.getAccessToken(); timeout = LocalDateTime.now().plusSeconds(response.getExpiresIn()).minusSeconds(30); } - return Map.entry("Authorization", "Bearer " + token); + return Map.of("Authorization", "Bearer " + token); } @Override @@ -48,8 +46,7 @@ private TokenResponse retrieveToken() { request, response -> { try { - return jsonMapper.fromJson( - EntityUtils.toString(response.getEntity()), TokenResponse.class); + return tokenResponseParser.parse(EntityUtils.toString(response.getEntity())); } catch (Exception e) { var errorMessage = String.format( diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java index 56fe10f..22ae5ad 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java @@ -14,45 +14,58 @@ import org.slf4j.LoggerFactory; public class SimpleAuthentication implements Authentication { - + private static final String CSRF_HEADER = "OPERATE-X-CSRF-TOKEN"; private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private final SimpleCredential simpleCredential; - private String token; + private SimpleAuthToken token; private LocalDateTime sessionTimeout; public SimpleAuthentication(SimpleCredential simpleCredential) { this.simpleCredential = simpleCredential; } - private String retrieveToken() { + private SimpleAuthToken retrieveToken() { try (CloseableHttpClient client = HttpClients.createDefault()) { HttpPost request = buildRequest(simpleCredential); - String cookie = + SimpleAuthToken simpleAuthToken = client.execute( request, response -> { + String csrfTokenCandidate = null; + Header csrfTokenHeader = response.getHeader(CSRF_HEADER); + if (csrfTokenHeader != null) { + csrfTokenCandidate = csrfTokenHeader.getValue(); + } Header[] cookieHeaders = response.getHeaders("Set-Cookie"); - String cookieCandidate = null; - String cookiePrefix = "OPERATE-SESSION"; + String sessionCookie = null; + String csrfCookie = null; + String sessionCookieName = "OPERATE-SESSION"; for (Header cookieHeader : cookieHeaders) { - if (cookieHeader.getValue().startsWith(cookiePrefix)) { - cookieCandidate = cookieHeader.getValue(); - break; + if (cookieHeader.getValue().startsWith(sessionCookieName)) { + sessionCookie = cookieHeader.getValue(); + } + if (cookieHeader.getValue().startsWith(CSRF_HEADER)) { + csrfCookie = cookieHeader.getValue(); } } - return cookieCandidate; + return new SimpleAuthToken(sessionCookie, csrfCookie, csrfTokenCandidate); }); - if (cookie == null) { - throw new RuntimeException("Unable to authenticate due to missing Set-Cookie"); + if (simpleAuthToken.sessionCookie() == null) { + throw new RuntimeException( + "Unable to authenticate due to missing Set-Cookie OPERATE-SESSION"); + } + if (simpleAuthToken.csrfToken() == null) { + LOG.info("No CSRF token found"); + } + if (simpleAuthToken.csrfCookie() == null) { + LOG.info("No CSRF cookie found"); } - token = cookie; sessionTimeout = LocalDateTime.now().plus(simpleCredential.sessionTimeout()); + return simpleAuthToken; } catch (Exception e) { - LOG.error("Authenticating for Operate failed due to " + e); throw new RuntimeException("Unable to authenticate", e); } - return token; } private HttpPost buildRequest(SimpleCredential simpleCredential) { @@ -65,16 +78,21 @@ private HttpPost buildRequest(SimpleCredential simpleCredential) { } @Override - public Map.Entry getTokenHeader() { - if (token == null) { + public Map getTokenHeader() { + if (token == null || sessionTimeout.isBefore(LocalDateTime.now())) { token = retrieveToken(); } - - return new AbstractMap.SimpleEntry<>("Cookie", token); + return Map.of( + "Cookie", + token.sessionCookie() + "; " + token.csrfCookie(), + CSRF_HEADER, + token.csrfToken()); } @Override public void resetToken() { token = null; } + + private record SimpleAuthToken(String sessionCookie, String csrfCookie, String csrfToken) {} } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java new file mode 100644 index 0000000..29ed64e --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java @@ -0,0 +1,25 @@ +package io.camunda.operate.auth; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +public interface TokenResponseParser { + TokenResponse parse(String response); + + public class JacksonTokenResponseParser implements TokenResponseParser { + private final ObjectMapper objectMapper; + + public JacksonTokenResponseParser(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + @Override + public TokenResponse parse(String response) { + try { + return objectMapper.readValue(response, TokenResponse.class); + } catch (JsonProcessingException e) { + throw new RuntimeException("Error while parsing token response", e); + } + } + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java index 6ec443a..314204c 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java @@ -1,26 +1,26 @@ package io.camunda.operate.http; -import com.google.common.reflect.TypeToken; -import io.camunda.common.exception.SdkException; -import io.camunda.common.json.JsonMapper; -import io.camunda.common.json.SdkObjectMapper; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import io.camunda.operate.auth.Authentication; -import java.io.IOException; +import io.camunda.operate.exception.SdkException; import java.lang.invoke.MethodHandles; -import java.nio.charset.StandardCharsets; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpStatus; -import org.apache.hc.core5.http.io.entity.EntityUtils; +import org.apache.hc.core5.http.io.HttpClientResponseHandler; import org.apache.hc.core5.http.io.entity.StringEntity; import org.apache.hc.core5.http.message.BasicHeader; import org.slf4j.Logger; @@ -30,29 +30,30 @@ public class DefaultHttpClient implements HttpClient { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - private final Map, String> endpointMap; + private final Map, String> endpointMap; private final CloseableHttpClient httpClient; private final Authentication authentication; - private final JsonMapper jsonMapper; + private final ObjectMapper objectMapper; private String host = ""; private String basePath = ""; public DefaultHttpClient(Authentication authentication) { - this.authentication = authentication; - this.httpClient = HttpClients.createDefault(); - this.jsonMapper = new SdkObjectMapper(); - this.endpointMap = new HashMap<>(); + this(authentication, HttpClients.createDefault(), new ObjectMapper(), new HashMap<>()); } public DefaultHttpClient( Authentication authentication, CloseableHttpClient httpClient, - JsonMapper jsonMapper, - Map, String> endpointMap) { + ObjectMapper objectMapper, + Map, String> endpointMap) { this.authentication = authentication; this.httpClient = httpClient; - this.jsonMapper = jsonMapper; + this.objectMapper = objectMapper.copy(); this.endpointMap = endpointMap; + this.objectMapper + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .setSerializationInclusion(JsonInclude.Include.NON_NULL); } @Override @@ -62,214 +63,86 @@ public void init(String host, String basePath) { } @Override - public void loadMap(Map, String> map) { + public void loadMap(Map, String> map) { this.endpointMap.putAll(map); } @Override - public T get(Class responseType, Long key) { - return get(responseType, String.valueOf(key)); - } - - @Override - public T get(Class responseType, String id) { - String url = host + basePath + retrievePath(responseType) + "/" + id; + public T get(TypeReference responseType, Map pathParams) { + String url = host + basePath + retrievePath(responseType, pathParams); HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(retrieveToken(responseType)); - T resp; - try (CloseableHttpResponse response = httpClient.execute(httpGet)) { - resp = parseAndRetry(response, responseType); + retrieveToken().forEach(httpGet::addHeader); + try { + return httpClient.execute(httpGet, handleResponse(responseType)); } catch (Exception e) { - LOG.error( - "Failed GET with responseType {}, id {} due to {}", responseType, id, e.getMessage()); - throw new SdkException(e); + throw new SdkException(String.format("Failed GET to %s, due to %s", url, e.getMessage()), e); } - - return resp; } @Override - public T get( - Class responseType, Class parameterType, TypeToken selector, Long key) { - return get(responseType, parameterType, selector, String.valueOf(key)); - } + public T post(TypeReference responseType, U body) { - private T get( - Class responseType, Class parameterType, TypeToken selector, String id) { - String resourcePath = retrievePath(selector.getClass()); - if (resourcePath.contains("{key}")) { - resourcePath = resourcePath.replace("{key}", String.valueOf(id)); - } else { - resourcePath = resourcePath + "/" + id; - } - String url = host + basePath + resourcePath; - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(retrieveToken(selector.getClass())); - T resp; - try (CloseableHttpResponse response = httpClient.execute(httpGet)) { - resp = parseAndRetry(response, responseType, parameterType, selector); - } catch (Exception e) { - LOG.error( - "Failed GET with responseType {}, parameterType {}, selector {}, id {} due to {}", - responseType, - parameterType, - selector, - id, - e.getMessage()); - throw new SdkException(e); - } - return resp; - } - - @Override - public String getXml(Class selector, Long key) { - String url = host + basePath + retrievePath(selector) + "/" + key + "/xml"; - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(retrieveToken(selector)); - String xml; - try (CloseableHttpResponse response = httpClient.execute(httpGet)) { - xml = parseXMLAndRetry(response, selector); - } catch (Exception e) { - LOG.error("Failed GET with selector {}, key {} due to {}", selector, key, e.getMessage()); - throw new SdkException(e); - } - return xml; - } - - @Override - public T post( - Class responseType, Class parameterType, TypeToken selector, U body) { - String url = host + basePath + retrievePath(selector.getClass()); + String url = host + basePath + retrievePath(responseType, Map.of()); HttpPost httpPost = new HttpPost(url); httpPost.addHeader("Content-Type", "application/json"); - httpPost.addHeader(retrieveToken(selector.getClass())); - T resp; - String data = jsonMapper.toJson(body); + retrieveToken().forEach(httpPost::addHeader); + String data; + try { + data = objectMapper.writeValueAsString(body); + } catch (JsonProcessingException e) { + throw new RuntimeException("Error while parsing " + body + "of type " + body.getClass(), e); + } httpPost.setEntity(new StringEntity(data)); - try (CloseableHttpResponse response = httpClient.execute(httpPost)) { - resp = parseAndRetry(response, responseType, parameterType, selector); + try { + return httpClient.execute(httpPost, handleResponse(responseType)); } catch (Exception e) { - LOG.error( - "Failed POST with responseType {}, parameterType {}, selector {}, body {} due to {}", - responseType, - parameterType, - selector, - body, - e.getMessage()); - throw new SdkException(e); + throw new SdkException( + String.format("Failed POST to %s with body %s, due to %s", url, data, e.getMessage()), e); } - return resp; } @Override - public T delete(Class responseType, Class selector, Long key) { - String resourcePath = retrievePath(selector) + "/" + key; + public T delete(TypeReference responseType, Map pathParams) { + String resourcePath = retrievePath(responseType, pathParams); String url = host + basePath + resourcePath; HttpDelete httpDelete = new HttpDelete(url); - httpDelete.addHeader(retrieveToken(selector)); - T resp = null; - try (CloseableHttpResponse response = httpClient.execute(httpDelete)) { - resp = parseAndRetry(response, responseType, selector); + retrieveToken().forEach(httpDelete::addHeader); + try { + return httpClient.execute(httpDelete, handleResponse(responseType)); } catch (Exception e) { - LOG.error( - "Failed DELETE with responseType {}, selector {}, key {}, due to {}", - responseType, - selector, - key, - e.getMessage()); - throw new SdkException(e); + throw new SdkException( + String.format("Failed DELETE to %s, due to %s", url, e.getMessage()), e); } - return resp; } - private String retrievePath(Class clazz) { + private String retrievePath(TypeReference clazz, Map pathParams) { AtomicReference path = new AtomicReference<>(); if (endpointMap.containsKey(clazz)) { path.set(endpointMap.get(clazz)); } - return path.get(); - } - - private Header retrieveToken(Class clazz) { - Map.Entry header = authentication.getTokenHeader(); - return new BasicHeader(header.getKey(), header.getValue()); - } - - // TODO: Refactor duplicate code parseAndRetry() - - private String parseXMLAndRetry(CloseableHttpResponse response, Class selector) - throws IOException { - String resp; - if (200 <= response.getCode() && response.getCode() <= 299) { - resp = - new String( - Java8Utils.readAllBytes(response.getEntity().getContent()), StandardCharsets.UTF_8); - } else { - if (response.getCode() == HttpStatus.SC_UNAUTHORIZED - || response.getCode() == HttpStatus.SC_FORBIDDEN) { - authentication.resetToken(); + for (String pathParam : pathParams.keySet()) { + String pathParamMarker = "{" + pathParam + "}"; + if (path.get().contains(pathParamMarker)) { + path.set(path.get().replace(pathParamMarker, pathParams.get(pathParam))); } - throw new SdkException("Response not successful: " + response.getCode()); } - return resp; + return path.get(); } - private T parseAndRetry(CloseableHttpResponse response, Class responseType) - throws IOException { - T resp; - if (200 <= response.getCode() && response.getCode() <= 299) { - HttpEntity entity = response.getEntity(); - String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); - resp = jsonMapper.fromJson(tmp, responseType); - EntityUtils.consume(entity); - } else { - if (response.getCode() == HttpStatus.SC_UNAUTHORIZED - || response.getCode() == HttpStatus.SC_FORBIDDEN) { - authentication.resetToken(); - // TODO: Add capability to auto retry the existing request - } - throw new SdkException("Response not successful: " + response.getCode()); - } - return resp; + private List retrieveToken() { + Map header = authentication.getTokenHeader(); + return header.entrySet().stream().map(e -> new BasicHeader(e.getKey(), e.getValue())).toList(); } - private T parseAndRetry( - CloseableHttpResponse response, Class responseType, Class selector) throws IOException { - T resp; - if (200 <= response.getCode() && response.getCode() <= 299) { - HttpEntity entity = response.getEntity(); - String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); - resp = jsonMapper.fromJson(tmp, responseType); - EntityUtils.consume(entity); - } else { - if (response.getCode() == HttpStatus.SC_UNAUTHORIZED - || response.getCode() == HttpStatus.SC_FORBIDDEN) { - authentication.resetToken(); - } - throw new SdkException("Response not successful: " + response.getCode()); - } - return resp; + private HttpClientResponseHandler handleResponse(TypeReference responseType) { + return new TypeReferenceHttpClientResponseHandler<>( + responseType, objectMapper, this::handleErrorResponse); } - private T parseAndRetry( - CloseableHttpResponse response, - Class responseType, - Class parameterType, - TypeToken selector) - throws IOException { - T resp; - if (200 <= response.getCode() && response.getCode() <= 299) { - HttpEntity entity = response.getEntity(); - String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); - resp = jsonMapper.fromJson(tmp, responseType, parameterType); - EntityUtils.consume(entity); - } else { - if (response.getCode() == HttpStatus.SC_UNAUTHORIZED - || response.getCode() == HttpStatus.SC_FORBIDDEN) { - authentication.resetToken(); - } - throw new SdkException("Response not successful: " + response.getCode()); + private SdkException handleErrorResponse(Integer code) { + if (code == HttpStatus.SC_UNAUTHORIZED || code == HttpStatus.SC_FORBIDDEN) { + authentication.resetToken(); } - return resp; + return new SdkException("Response not successful: " + code); } } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java index 6e0979b..006e1db 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java @@ -1,6 +1,6 @@ package io.camunda.operate.http; -import com.google.common.reflect.TypeToken; +import com.fasterxml.jackson.core.type.TypeReference; import java.util.Map; /** Interface to enable swappable http client implementations */ @@ -8,17 +8,11 @@ public interface HttpClient { void init(String host, String basePath); - void loadMap(Map, String> map); + void loadMap(Map, String> map); - T get(Class responseType, Long key); + T get(TypeReference responseType, Map pathParams); - T get(Class responseType, String id); + T post(TypeReference responseType, U body); - T get(Class responseType, Class parameterType, TypeToken selector, Long key); - - String getXml(Class selector, Long key); - - T post(Class responseType, Class parameterType, TypeToken selector, U body); - - T delete(Class responseType, Class selector, Long key); + T delete(TypeReference responseType, Map pathParams); } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandler.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandler.java new file mode 100644 index 0000000..0b14f62 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandler.java @@ -0,0 +1,41 @@ +package io.camunda.operate.http; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.function.Function; +import org.apache.hc.core5.http.ClassicHttpResponse; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.io.HttpClientResponseHandler; +import org.apache.hc.core5.http.io.entity.EntityUtils; + +public class TypeReferenceHttpClientResponseHandler implements HttpClientResponseHandler { + private final TypeReference typeReference; + private final ObjectMapper objectMapper; + private final Function errorCodeHandler; + + public TypeReferenceHttpClientResponseHandler( + TypeReference typeReference, + ObjectMapper objectMapper, + Function errorCodeHandler) { + this.typeReference = typeReference; + this.objectMapper = objectMapper; + this.errorCodeHandler = errorCodeHandler; + } + + @Override + public T handleResponse(ClassicHttpResponse response) throws HttpException, IOException { + T resp; + if (200 <= response.getCode() && response.getCode() <= 299) { + HttpEntity entity = response.getEntity(); + String tmp = new String(Java8Utils.readAllBytes(entity.getContent()), StandardCharsets.UTF_8); + resp = objectMapper.readValue(tmp, typeReference); + EntityUtils.consume(entity); + return resp; + } else { + throw errorCodeHandler.apply(response.getCode()); + } + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/TypeReferences.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/TypeReferences.java new file mode 100644 index 0000000..6e4a203 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/model/TypeReferences.java @@ -0,0 +1,30 @@ +package io.camunda.operate.model; + +import com.fasterxml.jackson.core.type.TypeReference; +import java.util.List; + +public interface TypeReferences { + TypeReference processInstance = new TypeReference<>() {}; + TypeReference> flownodeStatistics = new TypeReference<>() {}; + TypeReference> sequenceFlows = new TypeReference<>() {}; + TypeReference processDefinition = new TypeReference<>() {}; + TypeReference processDefinitionXml = new TypeReference<>() {}; + TypeReference> searchProcessDefinition = new TypeReference<>() {}; + TypeReference> searchDecisionDefinition = + new TypeReference<>() {}; + TypeReference decisionDefinition = new TypeReference<>() {}; + TypeReference> searchDecisionInstance = new TypeReference<>() {}; + TypeReference decisionInstance = new TypeReference<>() {}; + TypeReference> searchFlowNodeInstance = new TypeReference<>() {}; + TypeReference flowNodeInstance = new TypeReference<>() {}; + TypeReference> searchVariable = new TypeReference<>() {}; + TypeReference variable = new TypeReference<>() {}; + TypeReference> searchProcessInstance = new TypeReference<>() {}; + TypeReference> searchDecisionRequirements = + new TypeReference<>() {}; + TypeReference decisionRequirements = new TypeReference<>() {}; + TypeReference decisionRequirementsXml = new TypeReference<>() {}; + TypeReference> searchIncident = new TypeReference<>() {}; + TypeReference incident = new TypeReference<>() {}; + TypeReference deleteProcessInstance = new TypeReference<>() {}; +} diff --git a/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java index d7eaa2b..7eee40e 100644 --- a/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java +++ b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java @@ -5,20 +5,19 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import com.google.common.reflect.TypeToken; -import io.camunda.common.json.JsonMapper; -import io.camunda.common.json.SdkObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import io.camunda.operate.auth.Authentication; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.*; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.core5.http.io.HttpClientResponseHandler; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.internal.matchers.apachecommons.ReflectionEquals; import org.mockito.junit.jupiter.MockitoExtension; @@ -28,54 +27,52 @@ public class DefaultHttpClientTest { @Mock Authentication authentication; @Mock CloseableHttpClient chClient; - JsonMapper jsonMapper = new SdkObjectMapper(); + ObjectMapper jsonMapper = new ObjectMapper(); @Test public void shouldReturnGetType() throws IOException { // given - Map, String> productMap = new HashMap<>(); + TypeReference typeReference = new TypeReference<>() {}; + TypeReference typeReferenceWithSameType = new TypeReference<>() {}; + + Map, String> productMap = new HashMap<>(); + productMap.put(typeReference, "/request/{some}"); + productMap.put(typeReferenceWithSameType, "/no"); DefaultHttpClient defaultHttpClient = new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); - CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); MyResponseClass expectedOutput = new MyResponseClass(); expectedOutput.setName("test-name"); - + ArgumentCaptor captor = ArgumentCaptor.forClass(HttpGet.class); // when - when(chClient.execute(any(HttpGet.class))).thenReturn(response); - - when(response.getCode()).thenReturn(200); + when(chClient.execute(captor.capture(), any(HttpClientResponseHandler.class))) + .thenReturn(expectedOutput); + when(authentication.getTokenHeader()).thenReturn(Map.of("key", "value")); - when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); - - when(response.getEntity().getContent()) - .thenReturn(new ByteArrayInputStream("{\"name\" : \"test-name\"}".getBytes())); - MyResponseClass parsedResponse = defaultHttpClient.get(MyResponseClass.class, "123"); + MyResponseClass parsedResponse = + defaultHttpClient.get(typeReference, Map.of("some", "test-name")); // then assertTrue(new ReflectionEquals(expectedOutput).matches(parsedResponse)); + assertEquals("/request/test-name", captor.getValue().getRequestUri()); } @Test public void shouldReturnPostType() throws IOException { // given - Map, String> productMap = new HashMap<>(); + Map, String> productMap = new HashMap<>(); DefaultHttpClient defaultHttpClient = new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); - CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); MyResponseClass insideClass = new MyResponseClass(); insideClass.setName("test-name"); List expectedOutput = new ArrayList<>(); expectedOutput.add(insideClass); // when - when(chClient.execute(any(HttpPost.class))).thenReturn(response); - when(response.getCode()).thenReturn(200); - when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); - when(response.getEntity().getContent()) - .thenReturn(new ByteArrayInputStream("[{\"name\" : \"test-name\"}]".getBytes())); - List parsedResponse = - defaultHttpClient.post( - List.class, MyResponseClass.class, TypeToken.of(MyResponseClass.class), "dummy"); + when(chClient.execute(any(HttpPost.class), any(HttpClientResponseHandler.class))) + .thenReturn(expectedOutput); + when(authentication.getTokenHeader()).thenReturn(Map.of("key", "value")); + List parsedResponse = + defaultHttpClient.post(new TypeReference<>() {}, Map.of()); // then assertEquals(expectedOutput.size(), parsedResponse.size()); @@ -85,24 +82,17 @@ public void shouldReturnPostType() throws IOException { @Test public void shouldReturnDeleteType() throws IOException { // given - Map, String> productMap = new HashMap<>(); + Map, String> productMap = new HashMap<>(); DefaultHttpClient defaultHttpClient = new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); - CloseableHttpResponse response = mock(CloseableHttpResponse.class, RETURNS_DEEP_STUBS); MyResponseClass expectedOutput = new MyResponseClass(); expectedOutput.setName("test-name"); // when - when(chClient.execute(any(HttpDelete.class))).thenReturn(response); - - when(response.getCode()).thenReturn(200); - - when(authentication.getTokenHeader()).thenReturn(new AbstractMap.SimpleEntry<>("key", "value")); - - when(response.getEntity().getContent()) - .thenReturn(new ByteArrayInputStream("{\"name\" : \"test-name\"}".getBytes())); - MyResponseClass parsedResponse = - defaultHttpClient.delete(MyResponseClass.class, MySelectorClass.class, 123L); + when(chClient.execute(any(HttpDelete.class), any(HttpClientResponseHandler.class))) + .thenReturn(expectedOutput); + when(authentication.getTokenHeader()).thenReturn(Map.of("key", "value")); + MyResponseClass parsedResponse = defaultHttpClient.delete(new TypeReference<>() {}, Map.of()); // then assertTrue(new ReflectionEquals(expectedOutput).matches(parsedResponse)); diff --git a/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandlerTest.java b/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandlerTest.java new file mode 100644 index 0000000..96f6b2e --- /dev/null +++ b/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceHttpClientResponseHandlerTest.java @@ -0,0 +1,68 @@ +package io.camunda.operate.http; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.util.List; +import org.apache.hc.core5.http.ClassicHttpResponse; +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.io.entity.StringEntity; +import org.junit.jupiter.api.Test; + +public class TypeReferenceHttpClientResponseHandlerTest { + @Test + void shouldReturnTypedResponse() throws HttpException, IOException { + TypeReferenceHttpClientResponseHandler handler = + new TypeReferenceHttpClientResponseHandler<>( + new TypeReference<>() {}, new ObjectMapper(), code -> new RuntimeException()); + ClassicHttpResponse httpResponse = mock(ClassicHttpResponse.class); + when(httpResponse.getCode()).thenReturn(200); + when(httpResponse.getEntity()) + .thenReturn( + new StringEntity( + """ + { + "id": "x123", + "name": "John Doe" + } + """)); + Response r = handler.handleResponse(httpResponse); + assertEquals("x123", r.id()); + assertEquals("John Doe", r.name()); + } + + @Test + void shouldReturnTypedResponseList() throws HttpException, IOException { + TypeReferenceHttpClientResponseHandler> handler = + new TypeReferenceHttpClientResponseHandler<>( + new TypeReference<>() {}, new ObjectMapper(), code -> new RuntimeException()); + ClassicHttpResponse httpResponse = mock(ClassicHttpResponse.class); + when(httpResponse.getCode()).thenReturn(200); + when(httpResponse.getEntity()) + .thenReturn( + new StringEntity( + """ + [ + { + "id": "x123", + "name": "John Doe" + }, + { + "id": "x124", + "name": "John Dow" + } + ] + """)); + List r = handler.handleResponse(httpResponse); + assertEquals(2, r.size()); + assertEquals("x123", r.get(0).id()); + assertEquals("John Doe", r.get(0).name()); + assertEquals("x124", r.get(1).id()); + assertEquals("John Dow", r.get(1).name()); + } + + record Response(String id, String name) {} +} diff --git a/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceTest.java b/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceTest.java new file mode 100644 index 0000000..169fa34 --- /dev/null +++ b/extension/java-client-operate/src/test/java/io/camunda/operate/http/TypeReferenceTest.java @@ -0,0 +1,25 @@ +package io.camunda.operate.http; + +import static org.junit.jupiter.api.Assertions.*; + +import com.fasterxml.jackson.core.type.TypeReference; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class TypeReferenceTest { + + @Test + void shouldFindTypeReference() { + TypeReference stringTypeReference1 = new TypeReference<>() {}; + TypeReference stringTypeReference2 = new TypeReference<>() {}; + Map, String> map = + Map.of(stringTypeReference1, "/1", stringTypeReference2, "/2"); + String one = map.get(stringTypeReference1); + String two = map.get(stringTypeReference2); + assertEquals(one, "/1"); + assertEquals(two, "/2"); + } +} diff --git a/extension/pom.xml b/extension/pom.xml index 9f28d73..b4af855 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -10,18 +10,6 @@ operate-client-parent pom - - - - io.camunda.spring - java-common - ${project.version} - - - - - - java-client-operate spring-boot-starter-camunda-operate diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/ObjectMapperConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/ObjectMapperConfiguration.java new file mode 100644 index 0000000..521717a --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/ObjectMapperConfiguration.java @@ -0,0 +1,16 @@ +package io.camunda.operate.spring; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnMissingBean(ObjectMapper.class) +public class ObjectMapperConfiguration { + @Bean + @ConditionalOnMissingBean + public ObjectMapper objectMapper() { + return new ObjectMapper(); + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java index dac3776..6af1be7 100644 --- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java @@ -1,6 +1,6 @@ package io.camunda.operate.spring; -import io.camunda.common.json.JsonMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import io.camunda.operate.CamundaOperateClient; import io.camunda.operate.CamundaOperateClientConfiguration; import io.camunda.operate.auth.Authentication; @@ -8,25 +8,29 @@ import io.camunda.operate.auth.JwtCredential; import io.camunda.operate.auth.SimpleAuthentication; import io.camunda.operate.auth.SimpleCredential; +import io.camunda.operate.auth.TokenResponseParser; +import io.camunda.operate.auth.TokenResponseParser.JacksonTokenResponseParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; @EnableConfigurationProperties({ OperateClientConfigurationProperties.class, }) @ConditionalOnProperty(value = "operate.client.enabled", matchIfMissing = true) +@Import(ObjectMapperConfiguration.class) public class OperateClientConfiguration { private final OperateClientConfigurationProperties properties; - private final JsonMapper jsonMapper; + private final ObjectMapper objectMapper; @Autowired public OperateClientConfiguration( - OperateClientConfigurationProperties properties, JsonMapper jsonMapper) { + OperateClientConfigurationProperties properties, ObjectMapper objectMapper) { this.properties = properties; - this.jsonMapper = jsonMapper; + this.objectMapper = objectMapper; } @Bean @@ -45,7 +49,7 @@ public CamundaOperateClientConfiguration operateClientConfiguration( @Bean @ConditionalOnMissingBean - public Authentication authentication() { + public Authentication authentication(TokenResponseParser tokenResponseParser) { if (properties.profile() == null) { throw new IllegalStateException("'operate.client.profile' is required"); } @@ -65,9 +69,15 @@ public Authentication authentication() { properties.clientSecret(), properties.audience(), properties.authUrl().toString()), - jsonMapper); + tokenResponseParser); } default -> throw new IllegalStateException("Unsupported profile: " + properties.profile()); } } + + @Bean + @ConditionalOnMissingBean + public TokenResponseParser tokenResponseParser() { + return new JacksonTokenResponseParser(objectMapper); + } } diff --git a/pom.xml b/pom.xml index cd60894..00ebf99 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ extension + examples @@ -75,21 +76,6 @@ zeebe-process-test-extension-testcontainer ${zeebe.version} - - io.camunda.spring - spring-client-annotations - ${project.version} - - - io.camunda.spring - spring-client-common - ${project.version} - - - io.camunda.spring - spring-client-zeebe - ${project.version} - io.camunda.spring java-client-operate @@ -97,27 +83,7 @@ io.camunda.spring - spring-client-console - ${project.version} - - - io.camunda.spring - spring-boot-starter-camunda - ${project.version} - - - io.camunda.spring - spring-boot-starter-camunda-test-common - ${project.version} - - - io.camunda.spring - spring-boot-starter-camunda-test - ${project.version} - - - io.camunda.spring - spring-boot-starter-camunda-test-testcontainer + spring-boot-starter-camunda-operate ${project.version} @@ -170,6 +136,11 @@ commons-lang3 ${commons-lang.version} + + com.google.guava + guava + 33.2.1-jre + From f14209d07e983058a4c252dfc226e64d71278640 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Thu, 4 Jul 2024 16:35:18 +0200 Subject: [PATCH 5/9] removed guava --- extension/java-client-operate/pom.xml | 4 ---- .../camunda/operate/model/ListTypeToken.java | 11 --------- .../operate/model/SearchResultTypeToken.java | 24 ------------------- 3 files changed, 39 deletions(-) delete mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java delete mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java diff --git a/extension/java-client-operate/pom.xml b/extension/java-client-operate/pom.xml index 2b70848..1d7b697 100644 --- a/extension/java-client-operate/pom.xml +++ b/extension/java-client-operate/pom.xml @@ -22,10 +22,6 @@ com.fasterxml.jackson.core jackson-databind - - com.google.guava - guava - org.junit.jupiter junit-jupiter diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java deleted file mode 100644 index d0fc088..0000000 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/model/ListTypeToken.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.camunda.operate.model; - -import com.google.common.reflect.TypeToken; -import java.util.List; - -// See https://github.com/google/guava/wiki/ReflectionExplained -public class ListTypeToken { - public static TypeToken> listFlowNodeStatistics = - new TypeToken>() {}; - public static TypeToken> listSequenceFlows = new TypeToken>() {}; -} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java b/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java deleted file mode 100644 index 821fade..0000000 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/model/SearchResultTypeToken.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.camunda.operate.model; - -import com.google.common.reflect.TypeToken; - -// See https://github.com/google/guava/wiki/ReflectionExplained -public class SearchResultTypeToken { - - public static TypeToken> searchResultProcessDefinition = - new TypeToken>() {}; - public static TypeToken> searchResultDecisionDefinition = - new TypeToken>() {}; - public static TypeToken> searchResultDecisionInstance = - new TypeToken>() {}; - public static TypeToken> searchResultFlowNodeInstance = - new TypeToken>() {}; - public static TypeToken> searchResultVariable = - new TypeToken>() {}; - public static TypeToken> searchResultProcessInstance = - new TypeToken>() {}; - public static TypeToken> searchResultDecisionRequirements = - new TypeToken>() {}; - public static TypeToken> searchResultIncident = - new TypeToken>() {}; -} From 59c164bc86874c0648bd452b1174417616914bb6 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Fri, 5 Jul 2024 13:25:18 +0200 Subject: [PATCH 6/9] added docs --- README.md | 176 +++++++++++++----- .../camunda/operate/CamundaOperateClient.java | 18 +- .../CamundaOperateClientConfiguration.java | 8 +- .../operate/auth/JwtAuthentication.java | 15 +- .../camunda/operate/auth/JwtCredential.java | 5 +- .../operate/auth/TokenResponseParser.java | 25 --- .../operate/http/DefaultHttpClient.java | 29 +-- .../io/camunda/operate/http/HttpClient.java | 4 - .../operate/http/DefaultHttpClientTest.java | 22 ++- .../spring/OperateClientConfiguration.java | 29 +-- 10 files changed, 204 insertions(+), 127 deletions(-) delete mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java diff --git a/README.md b/README.md index 6506ece..cafc26b 100644 --- a/README.md +++ b/README.md @@ -6,38 +6,149 @@ This project is designed to simplify communication between a Java backend and the [Operate API of Camunda Platform 8](https://docs.camunda.io/docs/apis-clients/operate-api/). -## How to use the client +## How to build the client -Simply build a CamundaOperateClient that takes an authentication and the Operate URL as parameters. +### Spring Boot -```java -SimpleAuthentication sa = new SimpleAuthentication("demo", "demo", "http://localhost:8081"); -CamundaOperateClient client = new CamundaOperateClient.Builder().operateUrl("http://localhost:8081").authentication(sa).build(); -```` +Add the dependency to your project: + +```xml + + io.camunda.spring + spring-boot-starter-camunda-operate + ${version.operate-client} + +``` + +Configure a Camunda Operate client with simple authentication: + +```yaml +operate: + client: + profile: simple +``` + +To adjust the (meaningful) default properties, you can also override them: + +```yaml +operate: + client: + profile: simple + enabled: true + base-url: http://localhost:8081 + session-timeout: PT10M + username: demo + password: demo +``` -## Authentication -You can use the ***SimpleAuthentication*** to connect to a local Camunda Operate if your setup is "simple": ***without identity and keycloak***. -To connect to the **SaaS** Operate, you need to use the **SaasAuthentication** rather than the SimpleAuthentication. The SaaSAuthentication requires the ClientId and SecretId +Configure a Camunda Operate client with identity authentication: +```yaml +operate: + client: + profile: oidc + client-id: + client-secret: ``` -SaasAuthentication sa = new SaasAuthentication("2~nB1MwkUU45FuXXX", "aBRKtreXQF3uD2MYYY"); -CamundaOperateClient client = new CamundaOperateClient.Builder().authentication(sa) - .operateUrl("https://bru-2.operate.camunda.io/757dbc30-5127-4bed-XXXX-XXXXXXXXXXXX").build(); + +To adjust the (meaningful) default properties, you can also override them: + +```yaml +operate: + client: + profile: oidc + enabled: true + base-url: http://localhost:8081 + auth-url: http://localhost:18080/auth/realms/camunda-platform/openid-connect/token + audience: operate-api + client-id: + client-secret: ``` -You can also specify the OAuth-URL and audience, for example if you connect to a Camunda TEST system: +Configure a Camunda Operate client for Saas: +```yaml +operate: + client: + profile: saas + region: + cluster-id: + client-id: + client-secret: ``` -SaasAuthentication sa = new SaasAuthentication("https://login.cloud.camunda.io/oauth/token", "operate.camunda.io", 2~nB1MwkUU45FuXXX", "aBRKtreXQF3uD2MYYY"); + +```yaml +operate: + client: + profile: saas + enabled: true + base-url: https://${operate.client.region}.operate.camunda.io/${operate.client.cluster-id} + auth-url: https://login.cloud.camunda.io/oauth/token + audience: operate.camunda.io + region: + cluster-id: + client-id: + client-secret: ``` -To connect to the **Local** Operate with **Identity & Keycloak**, you need to use the **SelfManagedAuthentication**. The SelfManagedAuthentication requires the clientId and clientSecret. You can also change the Keycloak realm and the keycloakUrl depending on your installation. +### Plain Java + +Add the dependency to your project: + +```xml + + io.camunda.spring + java-client-operate + ${version.operate-client} + +``` + +Build a Camunda Operate client with simple authentication: ```java -SelfManagedAuthentication sma = new SelfManagedAuthentication().clientId("java").clientSecret("foTPogjlI0hidwbDZcYFWzmU8FOQwLx0").baseUrl("http://localhost:18080").keycloakRealm("camunda-platform"); -CamundaOperateClient client = new CamundaOperateClient.Builder().authentication(sma) - .operateUrl("http://localhost:8081/").build(); +// properties you need to provide +URL operateUrl = URI.create("http://localhost:8081").toURL(); +SimpleCredential credentials = new SimpleCredential("demo", "demo", operateUrl, Duration.ofMinutes(10)); +// bootstrapping +SimpleAuthentication authentication = new SimpleAuthentication(credentials); +ObjectMapper objectMapper = new ObjectMapper(); +CamundaOperateClientConfiguration configuration = new CamundaOperateClientConfiguration(authentication, operateUrl, objectMapper, HttpClients.createDefault()); +CamundaOperateClient client = new CamundaOperateClient(configuration); +``` + +Build a Camunda Operate client with identity authentication: + +```java +// properties you need to provide +String clientId = ""; +String clientSecret = ""; +String audience = "operate-api"; +URL operateUrl = URI.create("http://localhost:8081").toURL(); +URL authUrl = URI.create("http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token"); +// bootstrapping +JwtCredential credentials = new JwtCredential(clientId, clientSecret, audience, authUrl); +ObjectMapper objectMapper = new ObjectMapper(); +JwtAuthentication authentication = new JwtAuthentication(credentials, objectMapper); +CamundaOperateClientConfiguration configuration = new CamundaOperateClientConfiguration(authentication, operateUrl, objectMapper, HttpClients.createDefault()); +CamundaOperateClient client = new CamundaOperateClient(configuration); +``` + +Build a Camunda Operate client for Saas: + +```java +String region = ""; +String clusterId = ""; +String clientId = ""; +String clientSecret = ""; +// bootstrapping +URL operateUrl = URI.create("https://"+ region +".operate.camunda.io/" + clusterId).toURL(); +URL authUrl = URI.create("https://login.cloud.camunda.io/oauth/token"); +JwtCredential credentials = new JwtCredential(clientId, clientSecret, "operate.camunda.io", authUrl); +ObjectMapper objectMapper = new ObjectMapper(); +JwtAuthentication authentication = new JwtAuthentication(credentials, objectMapper); +CamundaOperateClientConfiguration configuration = new CamundaOperateClientConfiguration(authentication, operateUrl, objectMapper, HttpClients.createDefault()); +CamundaOperateClient client = new CamundaOperateClient(configuration); ``` ## Getting and Searching @@ -117,33 +228,6 @@ List incidents = client.searchIncidents(incidentQuery); Incident incident = client.getIncident(incidents.get(0).getKey()); ``` - - -## Use the Beta client -If you're using an older version of Camunda SaaS or you're having a local setup without Keycloak, you could also query the same APIs as Operate UI. In such a case, you might want to use the Beta client : - -```java -SimpleAuthentication sa = new SimpleAuthentication("demo", "demo", "http://localhost:8081"); -CamundaOperateClient client = new CamundaOperateClient.Builder().beta().operateUrl("http://localhost:8081").authentication(sa).build(); - -JsonNode json = ((CamundaOperateBetaClient) client).getFlowNodeStates(2L); - -AuditTrail auditTrail = ((CamundaOperateBetaClient) client).getAuditTrail(2L); -``` - -Obviously, as soon as the exposed APIs will be sufficient, we should get rid of this Beta client. - -# use it in your project -You can import it to your maven or gradle project as a dependency - -```xml - - io.camunda - camunda-operate-client-java - 8.3.0.1 - -``` - -# Note +## Note A similar library is available for the Tasklist API of Camunda Platform 8 here: [camunda-tasklist-client-java](https://github.com/camunda-community-hub/camunda-tasklist-client-java) diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java index 596c78e..c28a623 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java @@ -12,6 +12,8 @@ import io.camunda.zeebe.model.bpmn.BpmnModelInstance; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,7 +22,7 @@ public class CamundaOperateClient { private final HttpClient httpClient; - public CamundaOperateClient(HttpClient httpClient) { + private CamundaOperateClient(HttpClient httpClient) { this.httpClient = httpClient; } @@ -30,8 +32,6 @@ public CamundaOperateClient(CamundaOperateClientConfiguration configuration) { private static HttpClient buildOperateHttpClient( CamundaOperateClientConfiguration configuration) { - HttpClient httpClient = new DefaultHttpClient(configuration.authentication()); - httpClient.init(formatUrl(configuration.baseUrl().toString()), "/v1"); // load the config map Map, String> map = new HashMap<>(); // process definitions @@ -64,8 +64,16 @@ private static HttpClient buildOperateHttpClient( map.put(searchIncident, "/incidents/search"); map.put(incident, "/incidents/{key}"); - httpClient.loadMap(map); - return httpClient; + try { + return new DefaultHttpClient( + URI.create(formatUrl(configuration.baseUrl().toString() + "/v1")).toURL(), + configuration.authentication(), + configuration.httpClient(), + configuration.objectMapper(), + map); + } catch (MalformedURLException e) { + throw new RuntimeException("Error while initializing operate http client", e); + } } private static String formatUrl(String url) { diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java index 58c44b3..feaf767 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientConfiguration.java @@ -1,6 +1,12 @@ package io.camunda.operate; +import com.fasterxml.jackson.databind.ObjectMapper; import io.camunda.operate.auth.Authentication; import java.net.URL; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -public record CamundaOperateClientConfiguration(Authentication authentication, URL baseUrl) {} +public record CamundaOperateClientConfiguration( + Authentication authentication, + URL baseUrl, + ObjectMapper objectMapper, + CloseableHttpClient httpClient) {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java index 6a30dc9..713213d 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java @@ -1,5 +1,7 @@ package io.camunda.operate.auth; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.net.URISyntaxException; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -14,13 +16,13 @@ public class JwtAuthentication implements Authentication { private final JwtCredential jwtCredential; - private final TokenResponseParser tokenResponseParser; + private final ObjectMapper objectMapper; private String token; private LocalDateTime timeout; - public JwtAuthentication(JwtCredential jwtCredential, TokenResponseParser tokenResponseParser) { + public JwtAuthentication(JwtCredential jwtCredential, ObjectMapper objectMapper) { this.jwtCredential = jwtCredential; - this.tokenResponseParser = tokenResponseParser; + this.objectMapper = objectMapper; } @Override @@ -46,7 +48,8 @@ private TokenResponse retrieveToken() { request, response -> { try { - return tokenResponseParser.parse(EntityUtils.toString(response.getEntity())); + return objectMapper.readValue( + EntityUtils.toString(response.getEntity()), TokenResponse.class); } catch (Exception e) { var errorMessage = String.format( @@ -64,8 +67,8 @@ private TokenResponse retrieveToken() { } } - private HttpPost buildRequest() { - HttpPost httpPost = new HttpPost(jwtCredential.authUrl()); + private HttpPost buildRequest() throws URISyntaxException { + HttpPost httpPost = new HttpPost(jwtCredential.authUrl().toURI()); httpPost.addHeader("Content-Type", "application/json"); List formParams = new ArrayList<>(); formParams.add(new BasicNameValuePair("grant_type", "client_credentials")); diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java index 616318c..d094261 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java @@ -1,4 +1,5 @@ package io.camunda.operate.auth; -public record JwtCredential( - String clientId, String clientSecret, String audience, String authUrl) {} +import java.net.URL; + +public record JwtCredential(String clientId, String clientSecret, String audience, URL authUrl) {} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java deleted file mode 100644 index 29ed64e..0000000 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.camunda.operate.auth; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -public interface TokenResponseParser { - TokenResponse parse(String response); - - public class JacksonTokenResponseParser implements TokenResponseParser { - private final ObjectMapper objectMapper; - - public JacksonTokenResponseParser(ObjectMapper objectMapper) { - this.objectMapper = objectMapper; - } - - @Override - public TokenResponse parse(String response) { - try { - return objectMapper.readValue(response, TokenResponse.class); - } catch (JsonProcessingException e) { - throw new RuntimeException("Error while parsing token response", e); - } - } - } -} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java index 314204c..9699dac 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/DefaultHttpClient.java @@ -9,7 +9,7 @@ import io.camunda.operate.auth.Authentication; import io.camunda.operate.exception.SdkException; import java.lang.invoke.MethodHandles; -import java.util.HashMap; +import java.net.URL; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -17,7 +17,6 @@ import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; -import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.io.HttpClientResponseHandler; @@ -34,14 +33,10 @@ public class DefaultHttpClient implements HttpClient { private final CloseableHttpClient httpClient; private final Authentication authentication; private final ObjectMapper objectMapper; - private String host = ""; - private String basePath = ""; - - public DefaultHttpClient(Authentication authentication) { - this(authentication, HttpClients.createDefault(), new ObjectMapper(), new HashMap<>()); - } + private final String baseUrl; public DefaultHttpClient( + URL baseUrl, Authentication authentication, CloseableHttpClient httpClient, ObjectMapper objectMapper, @@ -54,22 +49,12 @@ public DefaultHttpClient( .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) .setSerializationInclusion(JsonInclude.Include.NON_NULL); - } - - @Override - public void init(String host, String basePath) { - this.host = host; - this.basePath = basePath; - } - - @Override - public void loadMap(Map, String> map) { - this.endpointMap.putAll(map); + this.baseUrl = baseUrl.toString(); } @Override public T get(TypeReference responseType, Map pathParams) { - String url = host + basePath + retrievePath(responseType, pathParams); + String url = baseUrl + retrievePath(responseType, pathParams); HttpGet httpGet = new HttpGet(url); retrieveToken().forEach(httpGet::addHeader); try { @@ -82,7 +67,7 @@ public T get(TypeReference responseType, Map pathParams) @Override public T post(TypeReference responseType, U body) { - String url = host + basePath + retrievePath(responseType, Map.of()); + String url = baseUrl + retrievePath(responseType, Map.of()); HttpPost httpPost = new HttpPost(url); httpPost.addHeader("Content-Type", "application/json"); retrieveToken().forEach(httpPost::addHeader); @@ -104,7 +89,7 @@ public T post(TypeReference responseType, U body) { @Override public T delete(TypeReference responseType, Map pathParams) { String resourcePath = retrievePath(responseType, pathParams); - String url = host + basePath + resourcePath; + String url = baseUrl + resourcePath; HttpDelete httpDelete = new HttpDelete(url); retrieveToken().forEach(httpDelete::addHeader); try { diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java index 006e1db..c1daec6 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/http/HttpClient.java @@ -6,10 +6,6 @@ /** Interface to enable swappable http client implementations */ public interface HttpClient { - void init(String host, String basePath); - - void loadMap(Map, String> map); - T get(TypeReference responseType, Map pathParams); T post(TypeReference responseType, U body); diff --git a/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java index 7eee40e..3dda395 100644 --- a/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java +++ b/extension/java-client-operate/src/test/java/io/camunda/operate/http/DefaultHttpClientTest.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.camunda.operate.auth.Authentication; import java.io.IOException; +import java.net.URI; import java.util.*; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; @@ -39,7 +40,12 @@ public void shouldReturnGetType() throws IOException { productMap.put(typeReference, "/request/{some}"); productMap.put(typeReferenceWithSameType, "/no"); DefaultHttpClient defaultHttpClient = - new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + new DefaultHttpClient( + URI.create("http://localhost:8081").toURL(), + authentication, + chClient, + jsonMapper, + productMap); MyResponseClass expectedOutput = new MyResponseClass(); expectedOutput.setName("test-name"); ArgumentCaptor captor = ArgumentCaptor.forClass(HttpGet.class); @@ -61,7 +67,12 @@ public void shouldReturnPostType() throws IOException { // given Map, String> productMap = new HashMap<>(); DefaultHttpClient defaultHttpClient = - new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + new DefaultHttpClient( + URI.create("http://localhost:8081").toURL(), + authentication, + chClient, + jsonMapper, + productMap); MyResponseClass insideClass = new MyResponseClass(); insideClass.setName("test-name"); List expectedOutput = new ArrayList<>(); @@ -84,7 +95,12 @@ public void shouldReturnDeleteType() throws IOException { // given Map, String> productMap = new HashMap<>(); DefaultHttpClient defaultHttpClient = - new DefaultHttpClient(authentication, chClient, jsonMapper, productMap); + new DefaultHttpClient( + URI.create("http://localhost:8081").toURL(), + authentication, + chClient, + jsonMapper, + productMap); MyResponseClass expectedOutput = new MyResponseClass(); expectedOutput.setName("test-name"); diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java index 6af1be7..2e8e1ba 100644 --- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java @@ -8,9 +8,10 @@ import io.camunda.operate.auth.JwtCredential; import io.camunda.operate.auth.SimpleAuthentication; import io.camunda.operate.auth.SimpleCredential; -import io.camunda.operate.auth.TokenResponseParser; -import io.camunda.operate.auth.TokenResponseParser.JacksonTokenResponseParser; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -43,13 +44,21 @@ public CamundaOperateClient camundaOperateClient( @Bean @ConditionalOnMissingBean public CamundaOperateClientConfiguration operateClientConfiguration( - Authentication authentication) { - return new CamundaOperateClientConfiguration(authentication, properties.baseUrl()); + Authentication authentication, + @Qualifier("operateHttpClient") CloseableHttpClient operateHttpClient) { + return new CamundaOperateClientConfiguration( + authentication, properties.baseUrl(), objectMapper, operateHttpClient); + } + + @Bean("operateHttpClient") + @ConditionalOnMissingBean(name = "operateHttpClient") + public CloseableHttpClient operateHttpClient() { + return HttpClients.createDefault(); } @Bean @ConditionalOnMissingBean - public Authentication authentication(TokenResponseParser tokenResponseParser) { + public Authentication authentication() { if (properties.profile() == null) { throw new IllegalStateException("'operate.client.profile' is required"); } @@ -68,16 +77,10 @@ public Authentication authentication(TokenResponseParser tokenResponseParser) { properties.clientId(), properties.clientSecret(), properties.audience(), - properties.authUrl().toString()), - tokenResponseParser); + properties.authUrl()), + objectMapper); } default -> throw new IllegalStateException("Unsupported profile: " + properties.profile()); } } - - @Bean - @ConditionalOnMissingBean - public TokenResponseParser tokenResponseParser() { - return new JacksonTokenResponseParser(objectMapper); - } } From 4f12d7fc5f914716b7e757576134bbe14fb55aa4 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Fri, 5 Jul 2024 15:09:47 +0200 Subject: [PATCH 7/9] added tests to example --- .../io/camunda/operate/example/ExampleTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 examples/operate-example-load-process-instance/src/test/java/io/camunda/operate/example/ExampleTest.java diff --git a/examples/operate-example-load-process-instance/src/test/java/io/camunda/operate/example/ExampleTest.java b/examples/operate-example-load-process-instance/src/test/java/io/camunda/operate/example/ExampleTest.java new file mode 100644 index 0000000..11847f4 --- /dev/null +++ b/examples/operate-example-load-process-instance/src/test/java/io/camunda/operate/example/ExampleTest.java @@ -0,0 +1,14 @@ +package io.camunda.operate.example; + +import io.camunda.operate.CamundaOperateClient; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class ExampleTest { + @Autowired CamundaOperateClient operateClient; + + @Test + void shouldRun() {} +} From 562aa60dc44bb652de9ce41650ebd0a793e90a59 Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Fri, 5 Jul 2024 15:10:13 +0200 Subject: [PATCH 8/9] declared all dependencies --- .../pom.xml | 62 +++++ extension/java-client-operate/pom.xml | 22 +- .../pom.xml | 66 +++++ pom.xml | 255 ++++++++++++------ 4 files changed, 316 insertions(+), 89 deletions(-) diff --git a/examples/operate-example-load-process-instance/pom.xml b/examples/operate-example-load-process-instance/pom.xml index 2526f73..0b73905 100644 --- a/examples/operate-example-load-process-instance/pom.xml +++ b/examples/operate-example-load-process-instance/pom.xml @@ -16,10 +16,72 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-autoconfigure + provided + + + org.springframework + spring-web + provided + + + org.springframework + spring-beans + provided + + + org.springframework + spring-context + provided + + + org.springframework.boot + spring-boot + provided + io.camunda.spring spring-boot-starter-camunda-operate + + io.camunda.spring + java-client-operate + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-test + test + + + org.junit.jupiter + junit-jupiter-api + test + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.springframework.boot:spring-boot-starter-web + org.springframework.boot:spring-boot-starter-test + io.camunda.spring:spring-boot-starter-camunda-operate + + + + + + \ No newline at end of file diff --git a/extension/java-client-operate/pom.xml b/extension/java-client-operate/pom.xml index 1d7b697..d834c99 100644 --- a/extension/java-client-operate/pom.xml +++ b/extension/java-client-operate/pom.xml @@ -10,6 +10,11 @@ java-client-operate + + org.slf4j + slf4j-api + provided + io.camunda zeebe-bpmn-model @@ -18,13 +23,28 @@ org.apache.httpcomponents.client5 httpclient5 + + org.apache.httpcomponents.core5 + httpcore5 + provided + com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + org.junit.jupiter - junit-jupiter + junit-jupiter-api test diff --git a/extension/spring-boot-starter-camunda-operate/pom.xml b/extension/spring-boot-starter-camunda-operate/pom.xml index 57e3a4d..f0801bd 100644 --- a/extension/spring-boot-starter-camunda-operate/pom.xml +++ b/extension/spring-boot-starter-camunda-operate/pom.xml @@ -16,6 +16,41 @@ org.springframework.boot spring-boot-starter + + org.springframework.boot + spring-boot-autoconfigure + provided + + + org.apache.httpcomponents.client5 + httpclient5 + provided + + + org.springframework + spring-core + provided + + + org.springframework + spring-beans + provided + + + org.springframework + spring-context + provided + + + org.springframework.boot + spring-boot + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + io.camunda.spring java-client-operate @@ -25,6 +60,37 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-test + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.assertj + assertj-core + test + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.springframework.boot:spring-boot-starter + org.springframework.boot:spring-boot-starter-test + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 00ebf99..006dfd3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,13 +30,24 @@ 3.5.0 - 3.1.1 - - -Xdoclint:none - https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ https://artifacts.camunda.com/artifactory/zeebe-io/ + + 0.11.0 + 3.1.2 + 3.3.1 + 3.6.0 + 3.3.0 + 2.43.0 + 3.13.0 + 0.10.2 + 3.7.1 + 3.12.1 + 3.7.1 + 3.1.0 + 1.15.0 + 3.3.1 @@ -147,39 +158,92 @@ - clean install - - com.mycila - license-maven-plugin - - true - + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.version.maven-source-plugin} + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${plugin.version.maven-assembly-plugin} + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.version.maven-resources-plugin} + + + org.apache.maven.plugins + maven-site-plugin + ${plugin.version.maven-site-plugin} + + + org.apache.maven.plugins + maven-dependency-plugin + ${plugin.version.maven-depdendency-plugin} + + + org.graalvm.buildtools + native-maven-plugin + ${plugin.version.native-maven-plugin} org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + ${plugin.version.maven-compiler-plugin} - ${java.version} - ${java.version} - ${java.version} - true + + -parameters + - org.apache.maven.plugins - maven-javadoc-plugin - - 8 - + org.springframework.boot + spring-boot-maven-plugin + ${version.spring-boot} + + + + 17 + en_US.utf8 + + ${maven.build.timestamp} + + + + + org.apache.maven.plugins + maven-install-plugin + ${plugin.version.maven-install-plugin} + + + org.apache.maven.plugins + maven-shade-plugin + ${plugin.version.maven-shade-plugin} org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + ${plugin.version.maven-surefire-plugin} + + true + org.apache.maven.plugins @@ -187,10 +251,9 @@ ${plugin.version.maven-enforcer-plugin} - - true - - + + + @@ -201,88 +264,104 @@ + + com.diffplug.spotless + spotless-maven-plugin + ${plugin.version.spotless-maven-plugin} + + + + + *.md + .gitignore + + + + + true + 2 + + + + + + + + + + + com.google.cloud.functions + function-maven-plugin + ${plugin.version.function-maven-plugin} + + + org.apache.maven.plugins + maven-release-plugin + ${plugin.version.maven-release-plugin} + + + com.github.eirslett + frontend-maven-plugin + ${plugin.version.frontend-maven-plugin} + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - + maven-dependency-plugin - - - default-compile - none - - - default-testCompile - none - - - java-compile - compile + analyze - compile - - - - java-test-compile - test-compile - - testCompile + analyze-only + + true + - org.jacoco - jacoco-maven-plugin - 0.8.12 + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-source-plugin + attach-sources - prepare-agent - - - - report - test - - report + jar - - com.diffplug.spotless - spotless-maven-plugin - 2.43.0 - - - - - *.md - .gitignore - - - - - true - 2 - - - - - - - - - From 4f9063b77237351ea8af5d3ed171d6ff968834fa Mon Sep 17 00:00:00 2001 From: Jonathan Lukas Date: Mon, 22 Jul 2024 13:40:46 +0200 Subject: [PATCH 9/9] regression --- extension/java-client-operate/pom.xml | 21 ++++++ .../camunda/common/auth/Authentication.java | 10 +++ .../io/camunda/common/auth/JwtConfig.java | 18 +++++ .../io/camunda/common/auth/JwtCredential.java | 21 ++++++ .../common/auth/SaaSAuthentication.java | 74 +++++++++++++++++++ .../auth/SaaSAuthenticationBuilder.java | 30 ++++++++ .../camunda/operate/CamundaOperateClient.java | 5 ++ .../operate/CamundaOperateClientBuilder.java | 57 ++++++++++++++ .../operate/auth/JwtAuthentication.java | 15 ++-- .../operate/auth/TokenResponseMapper.java | 25 +++++++ .../pom.xml | 13 +++- .../spring/OperateClientConfiguration.java | 4 +- .../OperateClientConfiguration.java | 50 +++++++++++++ .../properties/CamundaClientProperties.java | 4 + .../OperateClientConfigurationProperties.java | 16 ++++ pom.xml | 5 ++ 16 files changed, 359 insertions(+), 9 deletions(-) create mode 100644 extension/java-client-operate/src/main/java/io/camunda/common/auth/Authentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtConfig.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtCredential.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthentication.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthenticationBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientBuilder.java create mode 100644 extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseMapper.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/configuration/OperateClientConfiguration.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/CamundaClientProperties.java create mode 100644 extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/OperateClientConfigurationProperties.java diff --git a/extension/java-client-operate/pom.xml b/extension/java-client-operate/pom.xml index d834c99..1cf8461 100644 --- a/extension/java-client-operate/pom.xml +++ b/extension/java-client-operate/pom.xml @@ -42,6 +42,11 @@ jackson-annotations provided + + io.camunda + spring-boot-starter-camunda-sdk + provided + org.junit.jupiter junit-jupiter-api @@ -63,4 +68,20 @@ UTF-8 + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + io.camunda:spring-boot-starter-camunda-sdk + + + + + + + diff --git a/extension/java-client-operate/src/main/java/io/camunda/common/auth/Authentication.java b/extension/java-client-operate/src/main/java/io/camunda/common/auth/Authentication.java new file mode 100644 index 0000000..fbd0520 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/common/auth/Authentication.java @@ -0,0 +1,10 @@ +package io.camunda.common.auth; + +import java.util.Map; + +@Deprecated +public interface Authentication { + Map getTokenHeader(Product product); + + void resetToken(Product product); +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtConfig.java b/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtConfig.java new file mode 100644 index 0000000..2b1c89d --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtConfig.java @@ -0,0 +1,18 @@ +package io.camunda.common.auth; + +@Deprecated +public class JwtConfig { + private JwtCredential jwtCredential; + + public void addProduct(Product product, JwtCredential credential) { + this.jwtCredential = credential; + } + + public JwtCredential getJwtCredential() { + return jwtCredential; + } + + public JwtCredential getProduct(Product product) { + return jwtCredential; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtCredential.java b/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtCredential.java new file mode 100644 index 0000000..d831cc8 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/common/auth/JwtCredential.java @@ -0,0 +1,21 @@ +package io.camunda.common.auth; + +@Deprecated +public record JwtCredential(String clientId, String clientSecret, String audience, String authUrl) { + + public String getClientId() { + return clientId; + } + + public String getClientSecret() { + return clientSecret; + } + + public String getAudience() { + return audience; + } + + public String getAuthUrl() { + return authUrl; + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthentication.java new file mode 100644 index 0000000..0e49667 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthentication.java @@ -0,0 +1,74 @@ +package io.camunda.common.auth; + +import io.camunda.common.json.JsonMapper; +import io.camunda.operate.auth.JwtAuthentication; +import io.camunda.operate.auth.JwtCredential; +import io.camunda.operate.auth.TokenResponse; +import java.net.MalformedURLException; +import java.net.URI; +import java.time.LocalDateTime; +import java.util.Map; + +@Deprecated +public class SaaSAuthentication implements Authentication { + private final JwtAuthentication authentication; + private TokenContext tokenContext; + + public SaaSAuthentication(JwtAuthentication authentication) { + this.authentication = authentication; + } + + public SaaSAuthentication(JwtConfig jwtConfig, JsonMapper jsonMapper) { + this(jwtAuthentication(jwtConfig, jsonMapper)); + } + + private static JwtAuthentication jwtAuthentication(JwtConfig jwtConfig, JsonMapper jsonMapper) { + io.camunda.common.auth.JwtCredential jwtCredential = jwtConfig.getJwtCredential(); + JwtCredential credential; + try { + credential = + new JwtCredential( + jwtCredential.getClientId(), + jwtCredential.getClientSecret(), + jwtCredential.getAudience(), + URI.create(jwtCredential.getAuthUrl()).toURL()); + } catch (MalformedURLException e) { + throw new RuntimeException("Error while mapping jwt credential", e); + } + return new JwtAuthentication( + credential, (token) -> jsonMapper.fromJson(token, TokenResponse.class)); + } + + private JwtConfig jwtConfig() { + JwtConfig jwtConfig = new JwtConfig(); + JwtCredential jwtCredential = authentication.getJwtCredential(); + io.camunda.common.auth.JwtCredential credential = + new io.camunda.common.auth.JwtCredential( + jwtCredential.clientId(), + jwtCredential.clientSecret(), + jwtCredential.audience(), + jwtCredential.authUrl().toString()); + jwtConfig.addProduct(Product.ZEEBE, credential); + return jwtConfig; + } + + @Override + public Map getTokenHeader(Product product) { + return authentication.getTokenHeader(); + } + + @Override + public void resetToken(Product product) { + tokenContext = null; + } + + public JwtConfig getJwtConfig() { + return jwtConfig(); + } + + public JwtAuthentication getJwtAuthentication() { + return authentication; + } + + private record TokenContext(String token, LocalDateTime expiryDate) {} +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthenticationBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthenticationBuilder.java new file mode 100644 index 0000000..b043383 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/common/auth/SaaSAuthenticationBuilder.java @@ -0,0 +1,30 @@ +package io.camunda.common.auth; + +import io.camunda.common.json.JsonMapper; +import io.camunda.common.json.SdkObjectMapper; + +@Deprecated +public class SaaSAuthenticationBuilder { + private JsonMapper jsonMapper; + private JwtConfig jwtConfig; + + public SaaSAuthenticationBuilder withJsonMapper(JsonMapper jsonMapper) { + this.jsonMapper = jsonMapper; + return this; + } + + public SaaSAuthenticationBuilder withJwtConfig(JwtConfig jwtConfig) { + this.jwtConfig = jwtConfig; + return this; + } + + public Authentication build() { + if (jsonMapper == null) { + jsonMapper = new SdkObjectMapper(); + } + if (jwtConfig == null) { + throw new IllegalArgumentException("jwtConfig is required"); + } + return new SaaSAuthentication(jwtConfig, jsonMapper); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java index c28a623..1283133 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClient.java @@ -30,6 +30,11 @@ public CamundaOperateClient(CamundaOperateClientConfiguration configuration) { this(buildOperateHttpClient(configuration)); } + @Deprecated + public static CamundaOperateClientBuilder builder() { + return new CamundaOperateClientBuilder(); + } + private static HttpClient buildOperateHttpClient( CamundaOperateClientConfiguration configuration) { // load the config map diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientBuilder.java b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientBuilder.java new file mode 100644 index 0000000..b836d07 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/CamundaOperateClientBuilder.java @@ -0,0 +1,57 @@ +package io.camunda.operate; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.camunda.common.auth.SaaSAuthentication; +import io.camunda.operate.auth.Authentication; +import java.net.MalformedURLException; +import java.net.URI; +import org.apache.hc.client5.http.impl.classic.HttpClients; + +@Deprecated +public class CamundaOperateClientBuilder { + private String operateUrl; + private io.camunda.common.auth.Authentication authentication; + + public CamundaOperateClientBuilder operateUrl(String operateUrl) { + this.operateUrl = operateUrl; + return this; + } + + public CamundaOperateClientBuilder authentication( + io.camunda.common.auth.Authentication authentication) { + this.authentication = authentication; + return this; + } + + public CamundaOperateClientBuilder setup() { + // who needs this at all??? + return this; + } + + public CamundaOperateClient build() { + try { + Authentication auth = mapFromLegacy(); + CamundaOperateClientConfiguration configuration = + new CamundaOperateClientConfiguration( + auth, + URI.create(operateUrl).toURL(), + new ObjectMapper(), + HttpClients.createDefault()); + return new CamundaOperateClient(configuration); + } catch (MalformedURLException e) { + throw new RuntimeException("Error while creating operate client configuration", e); + } + } + + private Authentication mapFromLegacy() { + if (authentication == null) { + throw new IllegalStateException("Authentication not set"); + } + // there is only saas auth which is basically wrapping a jwt auth + if (authentication instanceof SaaSAuthentication saaSAuthentication) { + return saaSAuthentication.getJwtAuthentication(); + } + throw new IllegalStateException( + "Unknown authentication type: " + authentication.getClass().getName()); + } +} diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java index 713213d..1084e07 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java @@ -1,6 +1,5 @@ package io.camunda.operate.auth; -import com.fasterxml.jackson.databind.ObjectMapper; import java.net.URISyntaxException; import java.time.LocalDateTime; import java.util.ArrayList; @@ -16,13 +15,18 @@ public class JwtAuthentication implements Authentication { private final JwtCredential jwtCredential; - private final ObjectMapper objectMapper; + private final TokenResponseMapper tokenResponseMapper; private String token; private LocalDateTime timeout; - public JwtAuthentication(JwtCredential jwtCredential, ObjectMapper objectMapper) { + public JwtAuthentication(JwtCredential jwtCredential, TokenResponseMapper tokenResponseMapper) { this.jwtCredential = jwtCredential; - this.objectMapper = objectMapper; + this.tokenResponseMapper = tokenResponseMapper; + } + + @Deprecated + public JwtCredential getJwtCredential() { + return jwtCredential; } @Override @@ -48,8 +52,7 @@ private TokenResponse retrieveToken() { request, response -> { try { - return objectMapper.readValue( - EntityUtils.toString(response.getEntity()), TokenResponse.class); + return tokenResponseMapper.readToken(EntityUtils.toString(response.getEntity())); } catch (Exception e) { var errorMessage = String.format( diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseMapper.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseMapper.java new file mode 100644 index 0000000..f2b39a1 --- /dev/null +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/TokenResponseMapper.java @@ -0,0 +1,25 @@ +package io.camunda.operate.auth; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +public interface TokenResponseMapper { + TokenResponse readToken(String token); + + public class JacksonTokenResponseMapper implements TokenResponseMapper { + private final ObjectMapper objectMapper; + + public JacksonTokenResponseMapper(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + @Override + public TokenResponse readToken(String token) { + try { + return objectMapper.readValue(token, TokenResponse.class); + } catch (JsonProcessingException e) { + throw new RuntimeException("Error while reading token " + token, e); + } + } + } +} diff --git a/extension/spring-boot-starter-camunda-operate/pom.xml b/extension/spring-boot-starter-camunda-operate/pom.xml index f0801bd..3d93688 100644 --- a/extension/spring-boot-starter-camunda-operate/pom.xml +++ b/extension/spring-boot-starter-camunda-operate/pom.xml @@ -55,6 +55,11 @@ io.camunda.spring java-client-operate + + io.camunda + spring-boot-starter-camunda-sdk + provided + org.springframework.boot spring-boot-starter-test @@ -84,8 +89,12 @@ maven-dependency-plugin - org.springframework.boot:spring-boot-starter - org.springframework.boot:spring-boot-starter-test + org.springframework.boot:spring-boot-starter + + org.springframework.boot:spring-boot-starter-test + + io.camunda:spring-boot-starter-camunda-sdk + diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java index 2e8e1ba..f37cb9f 100644 --- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java @@ -8,6 +8,7 @@ import io.camunda.operate.auth.JwtCredential; import io.camunda.operate.auth.SimpleAuthentication; import io.camunda.operate.auth.SimpleCredential; +import io.camunda.operate.auth.TokenResponseMapper.JacksonTokenResponseMapper; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +21,7 @@ @EnableConfigurationProperties({ OperateClientConfigurationProperties.class, + io.camunda.zeebe.spring.client.properties.OperateClientConfigurationProperties.class }) @ConditionalOnProperty(value = "operate.client.enabled", matchIfMissing = true) @Import(ObjectMapperConfiguration.class) @@ -78,7 +80,7 @@ public Authentication authentication() { properties.clientSecret(), properties.audience(), properties.authUrl()), - objectMapper); + new JacksonTokenResponseMapper(objectMapper)); } default -> throw new IllegalStateException("Unsupported profile: " + properties.profile()); } diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/configuration/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/configuration/OperateClientConfiguration.java new file mode 100644 index 0000000..1869a98 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/configuration/OperateClientConfiguration.java @@ -0,0 +1,50 @@ +package io.camunda.zeebe.spring.client.configuration; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.camunda.common.auth.Authentication; +import io.camunda.operate.CamundaOperateClient; +import io.camunda.operate.CamundaOperateClientConfiguration; +import io.camunda.zeebe.spring.client.properties.CamundaClientProperties; +import io.camunda.zeebe.spring.client.properties.OperateClientConfigurationProperties; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; + +@Deprecated +public class OperateClientConfiguration { + private final OperateClientConfigurationProperties legacyProperties; + private final CamundaClientProperties properties; + private final Authentication authentication; + + public OperateClientConfiguration( + OperateClientConfigurationProperties legacyProperties, + CamundaClientProperties properties, + Authentication authentication) { + this.legacyProperties = legacyProperties; + this.properties = properties; + this.authentication = authentication; + } + + public CamundaOperateClient camundaOperateClient() { + io.camunda.operate.auth.Authentication auth = + (io.camunda.operate.auth.Authentication) authentication; + URL baseUrl; + try { + baseUrl = URI.create(operateUrl()).toURL(); + } catch (MalformedURLException e) { + throw new RuntimeException("Error while reading Operate url " + operateUrl(), e); + } + ObjectMapper objectMapper = new ObjectMapper(); + CloseableHttpClient httpClient = HttpClients.createDefault(); + CamundaOperateClientConfiguration configuration = + new CamundaOperateClientConfiguration(auth, baseUrl, objectMapper, httpClient); + return new CamundaOperateClient(configuration); + } + + private String operateUrl() { + // TODO actually return something + return ""; + } +} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/CamundaClientProperties.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/CamundaClientProperties.java new file mode 100644 index 0000000..e755b11 --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/CamundaClientProperties.java @@ -0,0 +1,4 @@ +package io.camunda.zeebe.spring.client.properties; + +@Deprecated +public class CamundaClientProperties {} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/OperateClientConfigurationProperties.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/OperateClientConfigurationProperties.java new file mode 100644 index 0000000..8eda9ac --- /dev/null +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/zeebe/spring/client/properties/OperateClientConfigurationProperties.java @@ -0,0 +1,16 @@ +package io.camunda.zeebe.spring.client.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Deprecated +@ConfigurationProperties("camunda.operate.client") +public record OperateClientConfigurationProperties(String baseUrl, String authUrl) { + + public String getBaseUrl() { + return baseUrl; + } + + public String getAuthUrl() { + return authUrl; + } +} diff --git a/pom.xml b/pom.xml index 006dfd3..00e88bb 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,11 @@ import pom + + io.camunda + spring-boot-starter-camunda-sdk + ${zeebe.version} + io.camunda zeebe-bpmn-model