diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/repository/DecisionRepository.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/repository/DecisionRepository.kt index 4328930d..1015666e 100644 --- a/data/src/main/kotlin/io/zeebe/zeeqs/data/repository/DecisionRepository.kt +++ b/data/src/main/kotlin/io/zeebe/zeeqs/data/repository/DecisionRepository.kt @@ -3,7 +3,6 @@ package io.zeebe.zeeqs.data.repository import io.zeebe.zeeqs.data.entity.Decision import org.springframework.data.repository.PagingAndSortingRepository import org.springframework.stereotype.Repository -import java.util.* @Repository interface DecisionRepository : PagingAndSortingRepository { @@ -13,5 +12,5 @@ interface DecisionRepository : PagingAndSortingRepository { fun findByDecisionRequirementsKeyAndDecisionId( decisionRequirementsKey: Long, decisionId: String - ): Optional + ): Decision? } \ No newline at end of file diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/DecisionEvaluationResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/DecisionEvaluationResolver.kt index 30b62566..24e454fb 100644 --- a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/DecisionEvaluationResolver.kt +++ b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/DecisionEvaluationResolver.kt @@ -6,7 +6,6 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.graphql.data.method.annotation.Argument import org.springframework.graphql.data.method.annotation.SchemaMapping import org.springframework.stereotype.Controller -import kotlin.jvm.optionals.getOrNull @Controller class DecisionEvaluationResolver( @@ -29,7 +28,7 @@ class DecisionEvaluationResolver( decisionRepository.findByDecisionRequirementsKeyAndDecisionId( decisionRequirementsKey = decisionEvaluation.decisionRequirementsKey, decisionId = it - ).getOrNull() + ) } } diff --git a/pom.xml b/pom.xml index b87f6a67..c641d90b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,385 +1,388 @@ - - 4.0.0 - pom - - - org.camunda.community - community-hub-release-parent - 1.4.2 - - - - io.zeebe.zeeqs - zeeqs-root - 2.8.1-SNAPSHOT - ZeeQS - Root - Query API for aggregated Zeebe data - - - data - graphql-api - hazelcast-importer - app - - - - 1.8.10 - - 8.1.9 - - 2.7.9 - - 1.3.0 - - 5.2.2 - - 3.5.2 - 1.17.6 - - - 17 - - https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ - - https://artifacts.camunda.com/artifactory/zeebe-io/ - - - - -Xdoclint:none - - 3.3.1 - - - - - - - io.zeebe.zeeqs - data - ${project.version} - - - - io.zeebe.zeeqs - graphql-api - ${project.version} - - - - io.zeebe.zeeqs - hazelcast-importer - ${project.version} - - - - io.camunda - zeebe-bom - ${zeebe.version} - import - pom - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - org.springframework.boot - spring-boot-starter-graphql - ${spring.boot.version} - - - - io.zeebe.hazelcast - zeebe-hazelcast-connector - ${hazelcast.exporter.version} - - - - com.hazelcast - hazelcast - ${version.hazelcast} - - - - io.zeebe - zeebe-test-container - ${zeebe-test-container.version} - - - - org.testcontainers - junit-jupiter - ${test-container.version} - - - org.testcontainers - postgresql - ${test-container.version} - - - - org.awaitility - awaitility-kotlin - 4.2.0 - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - + + 4.0.0 + pom + + + org.camunda.community + community-hub-release-parent + 1.4.2 + + + + io.zeebe.zeeqs + zeeqs-root + 2.8.1-SNAPSHOT + ZeeQS - Root + Query API for aggregated Zeebe data + + + data + graphql-api + hazelcast-importer + app + + + + 1.8.10 + + 8.1.9 + + 2.7.9 + + 1.3.0 + + 5.2.2 + + 3.5.2 + 1.17.6 + + + 17 + + https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ + + https://artifacts.camunda.com/artifactory/zeebe-io/ + + + + -Xdoclint:none + + 3.3.1 + + + + - - + + io.zeebe.zeeqs + data + ${project.version} + + + + io.zeebe.zeeqs + graphql-api + ${project.version} + + + + io.zeebe.zeeqs + hazelcast-importer + ${project.version} + + + + io.camunda + zeebe-bom + ${zeebe.version} + import + pom + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + org.springframework.boot + spring-boot-starter-graphql + ${spring.boot.version} + + + + io.zeebe.hazelcast + zeebe-hazelcast-connector + ${hazelcast.exporter.version} + + + + com.hazelcast + hazelcast + ${version.hazelcast} + + + + io.zeebe + zeebe-test-container + ${zeebe-test-container.version} + + + + org.testcontainers + junit-jupiter + ${test-container.version} + + + org.testcontainers + postgresql + ${test-container.version} + + + + org.awaitility + awaitility-kotlin + 4.2.0 + + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + - - - + + + + + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-reflect + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + -Xjsr305=strict + + + spring + jpa + + 11 + + + org.jetbrains.kotlin - kotlin-stdlib - - + kotlin-maven-allopen + ${kotlin.version} + + org.jetbrains.kotlin - kotlin-reflect - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - + kotlin-maven-noarg + ${kotlin.version} + + + + + compile + + compile + + + + + test-compile + + test-compile + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 11 + + + + + maven-javadoc-plugin + + + 8 + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.5.0 + + + copy + package + + copy + + + + + + + io.zeebe.hazelcast + zeebe-hazelcast-exporter + ${hazelcast.exporter.version} + jar + jar-with-dependencies + true + ${project.build.directory}/exporter + zeebe-hazelcast-exporter.jar + + + ${project.build.directory}/libs + false + true + + + + + org.apache.maven.plugins + maven-jar-plugin + + + empty-javadoc-jar + package + + jar + + + javadoc + ${basedir}/javadoc + + + + + + + + + + + com.google.cloud.tools + jib-maven-plugin + ${jib-maven-plugin.version} + + + ghcr.io/camunda-community-hub/zeeqs + ${project.version} + + + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.4.2 + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + + + + + + + community-action-maven-release + - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - -Xjsr305=strict - - - spring - jpa - - 11 - - - - org.jetbrains.kotlin - kotlin-maven-allopen - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-maven-noarg - ${kotlin.version} - - - - - compile - - compile - - - - - test-compile - - test-compile - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 11 - - - - - maven-javadoc-plugin - - - 8 - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.5.0 - - - copy - package - - copy - - - - - - - io.zeebe.hazelcast - zeebe-hazelcast-exporter - ${hazelcast.exporter.version} - jar - jar-with-dependencies - true - ${project.build.directory}/exporter - zeebe-hazelcast-exporter.jar - - - ${project.build.directory}/libs - false - true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - empty-javadoc-jar - package - - jar - - - javadoc - ${basedir}/javadoc - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + sign-artifacts + verify + + sign + + + + + + + --pinentry-mode + loopback + + + - - - - - com.google.cloud.tools - jib-maven-plugin - ${jib-maven-plugin.version} - - - ghcr.io/camunda-community-hub/zeeqs - ${project.version} - - - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.4.2 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - - - - - - - community-action-maven-release - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - - - - --pinentry-mode - loopback - - - - - - - - - - - zeebe - Zeebe Repository - https://artifacts.camunda.com/artifactory/zeebe-io/ - - true - - - false - - - - - zeebe-snapshots - Zeebe Snapshot Repository - https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ - - false - - - true - - - - - - https://github.com/camunda-community-hub/zeeqs - scm:git:git@github.com:camunda-community-hub/zeeqs.git - scm:git:git@github.com:camunda-community-hub/zeeqs.git - HEAD - + + + + + + + zeebe + Zeebe Repository + https://artifacts.camunda.com/artifactory/zeebe-io/ + + true + + + false + + + + + zeebe-snapshots + Zeebe Snapshot Repository + https://artifacts.camunda.com/artifactory/zeebe-io-snapshots/ + + false + + + true + + + + + + https://github.com/camunda-community-hub/zeeqs + scm:git:git@github.com:camunda-community-hub/zeeqs.git + scm:git:git@github.com:camunda-community-hub/zeeqs.git + + HEAD +