#120 make lock-timeout configurable

(cherry picked from commit 0b7d793)

Author: fbrns

README.md

@@ -277,21 +277,6 @@ You may also define a spring bean of type `FlywayCallback` and annotate it with
 interface provide several hook into the schema management lifecycle that may, for example, be used to
  `SET ROLE migrator` before and `RESET ROLE` after each migration. 
 
-### Customizing event locks 
-
-* **lock-duration**: The selected events are locked before transmission. If the transmission fails the events stay locked
-until the lock expires (default: 600 seconds).  
-
-* **lock-duration-buffer**: Since clocks never work exactly synchronous and sending events also takes some time, a safety
-buffer is included. During the last x seconds before the expiration of the lock the events are not considered for 
-transmission (default: 60 seconds).
-
-```yaml
-nakadi-producer:
-  lock-duration: 600 
-  lock-duration-buffer: 60
-``` 
-
 ### Test support
 
 This library provides a mock implementation of its Nakadi client that can be used in integration testing:
@@ -332,6 +317,21 @@ The example above uses `com.jayway.jsonpath:json-path:jar:2.2.0` to parse and te
 
 Note that you should disable the scheduled event transmission for the test (e.g. by setting `nakadi-producer.scheduled-transmission-enabled:false`), as that might interfere with the manual transmission and the clearing in the test setup, leading to events from one test showing up in the next test, depending on timing issues.
 
+### Customizing event locks
+
+* **lock-duration**: The selected events are locked before transmission. If the transmission fails the events stay locked
+until the lock expires. The default is currently 600 seconds but might change in future releases.  
+
+* **lock-duration-buffer**: Since clocks never work exactly synchronous and sending events also takes some time, a safety
+buffer is included. During the last x seconds before the expiration of the lock the events are not considered for 
+transmission. The default is currently 60 seconds but might change in future releases.
+
+```yaml
+nakadi-producer:
+  lock-duration: 600 
+  lock-duration-buffer: 60
+``` 
+
 ## Contributing
 
 We welcome contributions. Please have a look at our [contribution guidelines](CONTRIBUTING.md).

nakadi-producer/src/main/java/org/zalando/nakadiproducer/transmission/impl/EventTransmissionService.java

@@ -36,10 +36,6 @@ public class EventTransmissionService {
 
     private Clock clock = Clock.systemDefaultZone();
 
-    public EventTransmissionService(EventLogRepository eventLogRepository, NakadiPublishingClient nakadiPublishingClient, ObjectMapper objectMapper) {
-        this(eventLogRepository, nakadiPublishingClient, objectMapper, 600, 60);
-    }
-
     public EventTransmissionService(EventLogRepository eventLogRepository, NakadiPublishingClient nakadiPublishingClient, ObjectMapper objectMapper,
     int lockDuration, int lockDurationBuffer) {
         this.eventLogRepository = eventLogRepository;

nakadi-producer/src/test/java/org/zalando/nakadiproducer/transmission/impl/EventTransmissionServiceTest.java

@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 import org.zalando.fahrschein.EventPublishingException;
 import org.zalando.fahrschein.domain.BatchItemResponse;
@@ -53,7 +52,7 @@ public void setUp() {
         repo = mock(EventLogRepository.class);
         publishingClient = spy(new MockNakadiPublishingClient());
         mapper = spy(new ObjectMapper());
-        service = new EventTransmissionService(repo, publishingClient, mapper);
+        service = new EventTransmissionService(repo, publishingClient, mapper, 600, 60);
     }
 
     @Test