Merge pull request #26 from zeebe-io/deps-hazelcast-0.9.0

chore(deps): dump zeebe-hazelcast-connector to 0.9.0
camunda-community-hub · May 22, 2020 · c0bf1bb · c0bf1bb
2 parents bf3b63a + 41e0d82
commit c0bf1bb
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 58 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>2.1.0</version>
+        <version>2.3.0</version>
         <configuration>
           <to>
             <image>docker.io/camunda/zeeqs</image>

diff --git a/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt b/app/src/main/kotlin/io/zeebe/zeeqs/HazelcastProperties.kt
@@ -4,7 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
 
 @ConstructorBinding
-@ConfigurationProperties("io.zeebe.hazelcast")
+@ConfigurationProperties("zeebe.hazelcast")
 data class HazelcastProperties(
-        val connection: String = "localhost:5701"
+        val connection: String = "localhost:5701",
+        val connectionTimeout: String = "PT30S"
 )
diff --git a/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt b/app/src/main/kotlin/io/zeebe/zeeqs/ZeeqlApplication.kt
@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.cache.annotation.EnableCaching
+import java.time.Duration
 import javax.annotation.PostConstruct
 
 @SpringBootApplication
@@ -20,9 +21,10 @@ class ZeeqlApplication(
     @PostConstruct
     fun init() {
         val connection = hazelcastProperties.connection
+        val connectionTimeout = Duration.parse(hazelcastProperties.connectionTimeout)
 
         logger.info("connect to Hazelcast: '$connection'")
-        hazelcastImporter.start(connection)
+        hazelcastImporter.start(connection, connectionTimeout)
     }
 }
 

diff --git a/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt b/data/src/test/kotlin/io/zeebe/zeeqs/WorkflowServiceTest.kt
@@ -29,7 +29,7 @@ class WorkflowServiceTest(
         val bpmn = Bpmn.createExecutableProcess("wf")
                 .startEvent("s").name("start")
                 .serviceTask("t").name("task")
-                .zeebeTaskType("test")
+                .zeebeJobType("test")
                 .endEvent("e").name("")
                 .done()
 

diff --git a/docker/application.yaml b/docker/application.yaml
@@ -0,0 +1,6 @@
+zeebe:
+  broker:
+    exporters:
+      hazelcast:
+        className: io.zeebe.hazelcast.exporter.HazelcastExporter
+        jarPath: exporters/zeebe-hazelcast-exporter.jar
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 services:
   zeebe:
     container_name: zeebe_broker
-    image: camunda/zeebe:0.22.2
+    image: camunda/zeebe:0.23.1
     environment:
       - ZEEBE_LOG_LEVEL=debug
     ports:
@@ -16,14 +16,15 @@ services:
       - "5701:5701"
     volumes:
       - ../target/exporter/zeebe-hazelcast-exporter.jar:/usr/local/zeebe/exporters/zeebe-hazelcast-exporter.jar
-      - ./zeebe.cfg.toml:/usr/local/zeebe/conf/zeebe.cfg.toml
+      - ./application.yaml:/usr/local/zeebe/config/application.yaml
     networks:
       - zeebe_network
-  monitor:
+
+  zeeqs:
     container_name: zeeqs
     image: camunda/zeeqs:latest
     environment:
-      - io.zeebe.hazelcast.connection=zeebe:5701
+      - zeebe.hazelcast.connection=zeebe:5701
     ports:
       - "9000:9000"
     depends_on:

diff --git a/docker/zeebe.cfg.toml b/docker/zeebe.cfg.toml
diff --git a/graphql-api/pom.xml b/graphql-api/pom.xml
@@ -19,18 +19,18 @@
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
+      <groupId>com.graphql-java-kickstart</groupId>
       <artifactId>graphql-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
-      <artifactId>graphql-java-tools</artifactId>
+      <groupId>com.graphql-java-kickstart</groupId>
+      <artifactId>graphiql-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.graphql-java</groupId>
-      <artifactId>graphiql-spring-boot-starter</artifactId>
+      <groupId>com.graphql-java-kickstart</groupId>
+      <artifactId>graphql-java-tools</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt b/...src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/IncidentConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Incident
 import org.springframework.stereotype.Component
 

diff --git a/...-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt b/...-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/JobConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Job
 import org.springframework.stereotype.Component
 

diff --git a/.../src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt b/.../src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/MessageConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import org.springframework.stereotype.Component
 

diff --git a/...src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt b/...src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Workflow
 import org.springframework.stereotype.Component
 

diff --git a/.../kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt b/.../kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowInstanceConnectionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.WorkflowInstance
 import org.springframework.stereotype.Component
 

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/connection/WorkflowResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.connection
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.MessageSubscription
 import io.zeebe.zeeqs.data.entity.Timer
 import io.zeebe.zeeqs.data.entity.Workflow

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/IncidentQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.IncidentState
 import io.zeebe.zeeqs.data.repository.IncidentRepository

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/JobQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Job
 import io.zeebe.zeeqs.data.entity.JobState
 import io.zeebe.zeeqs.data.repository.JobRepository

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/MessageQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.repository.MessageRepository
 import io.zeebe.zeeqs.graphql.resolvers.connection.MessageConnection

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/VariableQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Variable
 import io.zeebe.zeeqs.data.repository.VariableRepository
 import org.springframework.stereotype.Component

diff --git a/...i/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt b/...i/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowInstanceQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.WorkflowInstance
 import io.zeebe.zeeqs.data.entity.WorkflowInstanceState
 import io.zeebe.zeeqs.data.repository.WorkflowInstanceRepository

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/query/WorkflowQueryResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver
+import graphql.kickstart.tools.GraphQLQueryResolver
 import io.zeebe.zeeqs.data.entity.Workflow
 import io.zeebe.zeeqs.data.repository.WorkflowRepository
 import io.zeebe.zeeqs.graphql.resolvers.connection.WorkflowConnection

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import io.zeebe.zeeqs.data.service.WorkflowService

diff --git a/...in/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt b/...in/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/ElementInstanceStateTransitionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstanceStateTransition
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension
 import org.springframework.stereotype.Component

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/IncidentResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.Job

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/JobResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Incident
 import io.zeebe.zeeqs.data.entity.Job

diff --git a/...l-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt b/...l-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageCorrelationResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.entity.MessageCorrelation
 import io.zeebe.zeeqs.data.entity.MessageSubscription

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.Message
 import io.zeebe.zeeqs.data.entity.MessageCorrelation
 import io.zeebe.zeeqs.data.entity.MessageSubscription

diff --git a/...-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt b/...-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/MessageSubscriptionResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.ElementInstanceRepository
 import io.zeebe.zeeqs.data.repository.MessageCorrelationRepository

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/TimerResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.graphql.resolvers.type
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Timer
 import io.zeebe.zeeqs.data.entity.Workflow

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.ElementInstance
 import io.zeebe.zeeqs.data.entity.Variable
 import io.zeebe.zeeqs.data.entity.VariableUpdate

diff --git a/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt b/graphql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/VariableUpdateResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.VariableUpdate
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension
 import org.springframework.stereotype.Component

diff --git a/...hql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt b/...hql-api/src/main/kotlin/io/zeebe/zeeqs/graphql/resolvers/type/WorkflowInstanceResolver.kt
@@ -1,6 +1,6 @@
 package io.zeebe.zeeqs.data.resolvers
 
-import com.coxautodev.graphql.tools.GraphQLResolver
+import graphql.kickstart.tools.GraphQLResolver
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import io.zeebe.zeeqs.graphql.resolvers.type.ResolverExtension.timestampToString

diff --git a/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt b/hazelcast-importer/src/main/kotlin/io/zeebe/zeeqs/importer/hazelcast/HazelcastImporter.kt
@@ -7,6 +7,8 @@ import io.zeebe.hazelcast.connect.java.ZeebeHazelcast
 import io.zeebe.zeeqs.data.entity.*
 import io.zeebe.zeeqs.data.repository.*
 import org.springframework.stereotype.Component
+import java.time.Duration
+
 
 @Component
 class HazelcastImporter(
@@ -26,7 +28,7 @@ class HazelcastImporter(
 
     var zeebeHazelcast: ZeebeHazelcast? = null
 
-    fun start(hazelcastConnection: String) {
+    fun start(hazelcastConnection: String, hazelcastConnectionTimeout: Duration) {
 
         val hazelcastConfig = hazelcastConfigRepository.findById(hazelcastConnection)
                 .orElse(HazelcastConfig(
@@ -41,9 +43,9 @@ class HazelcastImporter(
         val clientConfig = ClientConfig()
         val networkConfig = clientConfig.networkConfig
         networkConfig.addresses = listOf(hazelcastConnection)
-        // networkConfig.connectionAttemptPeriod = Duration.ofSeconds(10).toMillis().toInt()
-        // networkConfig.connectionAttemptLimit = 10
-        // networkConfig.connectionTimeout = Duration.ofSeconds(10).toMillis().toInt()
+
+        val connectionRetryConfig = clientConfig.connectionStrategyConfig.connectionRetryConfig
+        connectionRetryConfig.clusterConnectTimeoutMillis = hazelcastConnectionTimeout.toMillis()
 
         val hazelcast = HazelcastClient.newHazelcastClient(clientConfig)
 

diff --git a/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt b/hazelcast-importer/src/test/kotlin/io/zeebe/zeeqs/HazelcastImporterTest.kt
@@ -46,7 +46,7 @@ class HazelcastImporterTest(
     fun `should import workflow`() {
         // given
         val port = zeebe.getMappedPort(hazelcastPort)
-        importer.start("localhost:$port")
+        importer.start("localhost:$port", Duration.ofSeconds(10))
 
         val client = ZeebeClient.newClientBuilder()
                 .brokerContactPoint(zeebe.getExternalAddress(ZeebePort.GATEWAY))
@@ -58,7 +58,7 @@ class HazelcastImporterTest(
                 .addWorkflowModel(
                         Bpmn.createExecutableProcess("wf")
                                 .startEvent()
-                                .serviceTask("task-1").zeebeTaskType("test")
+                                .serviceTask("task-1").zeebeJobType("test")
                                 .endEvent()
                                 .done(),
                         "wf.bpmn")