Merge pull request #54 from viadee/release/1.2.2

Release/1.2.2
viadee · Jan 31, 2020 · ea83ab6 · ea83ab6
2 parents f0eef52 + 76ec179
commit ea83ab6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 10 deletions.
diff --git a/camunda-kafka-model/pom.xml b/camunda-kafka-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.viadee.camunda</groupId>
         <artifactId>camunda-kafka-polling-client-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/camunda-kafka-polling-client/pom.xml b/camunda-kafka-polling-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.viadee.camunda</groupId>
         <artifactId>camunda-kafka-polling-client-parent</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/.../main/java/de/viadee/camunda/kafka/pollingclient/config/properties/PollingProperties.java b/.../main/java/de/viadee/camunda/kafka/pollingclient/config/properties/PollingProperties.java
@@ -38,6 +38,11 @@ public class PollingProperties {
      */
     private boolean enabled;
 
+    /**
+     * The ms polling slice ends before the current time stamp
+     */
+    private long backwardOffsetInMs;
+
     /**
      * Initial timestamp to start polling with in case no polling has been performed before. (Default: Start timestamp
      * of polling client)
@@ -103,4 +108,21 @@ public void setLastPolledFile(final File lastPolledFile) {
     public void setEnabled(final boolean enabled) {
         this.enabled = enabled;
     }
+
+    /**
+     * The ms polling slice ends before the current time stamp
+     */
+    @java.lang.SuppressWarnings("all")
+    public long getBackwardOffsetInMs() {
+        return backwardOffsetInMs;
+    }
+
+    /**
+     * The ms polling slice ends before the current time stamp
+     */
+    @java.lang.SuppressWarnings("all")
+    public void setBackwardOffsetInMs(long backwardOffsetInMs) {
+        this.backwardOffsetInMs = backwardOffsetInMs;
+    }
+
 }
diff --git a/...ain/java/de/viadee/camunda/kafka/pollingclient/job/runtime/RuntimeDataPollingService.java b/...ain/java/de/viadee/camunda/kafka/pollingclient/job/runtime/RuntimeDataPollingService.java
@@ -1,10 +1,6 @@
 package de.viadee.camunda.kafka.pollingclient.job.runtime;
 
-import de.viadee.camunda.kafka.event.ActivityInstanceEvent;
-import de.viadee.camunda.kafka.event.CommentEvent;
-import de.viadee.camunda.kafka.event.IdentityLinkEvent;
-import de.viadee.camunda.kafka.event.ProcessInstanceEvent;
-import de.viadee.camunda.kafka.event.VariableUpdateEvent;
+import de.viadee.camunda.kafka.event.*;
 import de.viadee.camunda.kafka.pollingclient.config.properties.ApplicationProperties;
 import de.viadee.camunda.kafka.pollingclient.service.event.EventService;
 import de.viadee.camunda.kafka.pollingclient.service.lastpolled.LastPolledService;

diff --git a/...unda/kafka/pollingclient/service/lastpolled/filebased/FilebasedLastPolledServiceImpl.java b/...unda/kafka/pollingclient/service/lastpolled/filebased/FilebasedLastPolledServiceImpl.java
@@ -68,7 +68,7 @@ public PollingTimeslice getPollingTimeslice() {
             }
         }
 
-        Date endTimestamp = new Date();
+        Date endTimestamp = new Date(new Date().getTime() - pollingProperties.getBackwardOffsetInMs());
         if (endTimestamp.compareTo(startTimestamp) < 0) {
             endTimestamp = startTimestamp;
         }

diff --git a/camunda-kafka-polling-client/src/main/resources/application.properties b/camunda-kafka-polling-client/src/main/resources/application.properties
@@ -3,12 +3,14 @@ server.port=8081
 polling.repository-data.enabled=true
 polling.repository-data.initial-timestamp=${POLLING_REPOSITORY_DATA_INITIAL_TIMESTAMP:}
 polling.repository-data.interval-in-ms=30000
+polling.repository-data.backward-offset-in-ms=100
 polling.repository-data.last-polled-file=./lastPolled-repository.properties
 
 polling.runtime-data.enabled=true
 polling.runtime-data.initial-timestamp=${POLLING_RUNTIME_DATA_INITIAL_TIMESTAMP:}
 polling.runtime-data.interval-in-ms=30000
-polling.runtime-data.last-polled-file=./lastPolled-runtime.properties
+polling.runtime-data.backward-offset-in-ms=60000
+polling.runtime-data.last-polled-file=./lastPolled-runtime.properties 
 
 polling.polling-events[0]=PROCESS_INSTANCE_UNFINISHED
 polling.polling-events[1]=PROCESS_INSTANCE_FINISHED

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.viadee.camunda</groupId>
     <artifactId>camunda-kafka-polling-client-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>pom</packaging>
 
     <modules>