Merge branch 'master' into aruha-961-check-reset-cursors

# Conflicts: # CHANGELOG.md # src/acceptance-test/java/org/zalando/nakadi/webservice/hila/HilaAT.java
zalando · Aug 4, 2017 · 924e5ca · 924e5ca
2 parents 9683c3c + 58cce1a
commit 924e5ca
Show file tree

Hide file tree

Showing 61 changed files with 1,122 additions and 728 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- Changed imports format to have the same structure
+
 ### Fixed
 - Added validation of offsets availability when resetting subscription cursors.
 
+## [1.1.3] - 2017-08-03
+
+### Fixed
+- Fixed bug with incorrect lag calculation for subscirption.
+- Optimized subscription stats endpoint for subscriptions with many event types inside.
+
+### Changed
+- Now it's possible to have a digit after the dot in event-type name.
+
+## [1.1.2] - 2017-08-01
+
+### Changed
+- Updated kafka client library to 0.10.1.0
+
 ## [1.1.1] - 2017-07-26
 
 ### Fixed

diff --git a/docs/_data/nakadi-event-bus-api.yaml b/docs/_data/nakadi-event-bus-api.yaml
@@ -2154,7 +2154,7 @@ definitions:
           follow a common pattern that makes it easy to read and understand, but this level of
           structure is not enforced. For example a team name and data type can be used such as
           'acme-team.price-change'.
-        pattern: '[a-zA-Z][-0-9a-zA-Z_]*(\.[a-zA-Z][-0-9a-zA-Z_]*)*'
+        pattern: '[a-zA-Z][-0-9a-zA-Z_]*(\.[0-9a-zA-Z][-0-9a-zA-Z_]*)*'
         example: order.order_cancelled, acme-platform.users
       owning_application:
         type: string

diff --git a/src/acceptance-test/java/org/zalando/nakadi/repository/db/SchemaRepositoryTest.java b/src/acceptance-test/java/org/zalando/nakadi/repository/db/SchemaRepositoryTest.java
@@ -1,7 +1,6 @@
 package org.zalando.nakadi.repository.db;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import java.util.List;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
@@ -12,6 +11,9 @@
 import org.zalando.nakadi.domain.Version;
 import org.zalando.nakadi.utils.EventTypeTestBuilder;
 import org.zalando.nakadi.utils.TestUtils;
+
+import java.util.List;
+
 import static org.zalando.nakadi.utils.TestUtils.randomUUID;
 
 public class SchemaRepositoryTest extends AbstractDbRepositoryTest {

diff --git a/src/acceptance-test/java/org/zalando/nakadi/repository/db/StorageDbRepositoryTest.java b/src/acceptance-test/java/org/zalando/nakadi/repository/db/StorageDbRepositoryTest.java
@@ -1,22 +1,24 @@
 package org.zalando.nakadi.repository.db;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.zalando.nakadi.domain.EventType;
+import org.zalando.nakadi.domain.Storage;
+import org.zalando.nakadi.domain.Timeline;
+import org.zalando.nakadi.exceptions.runtime.NoStorageException;
+import org.zalando.nakadi.exceptions.runtime.StorageIsUsedException;
+import org.zalando.nakadi.utils.TestUtils;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
-import org.zalando.nakadi.domain.EventType;
-import org.zalando.nakadi.domain.Storage;
-import org.zalando.nakadi.domain.Timeline;
-import org.zalando.nakadi.exceptions.runtime.NoStorageException;
-import org.zalando.nakadi.exceptions.runtime.StorageIsUsedException;
-import org.zalando.nakadi.utils.TestUtils;
 import static org.zalando.nakadi.utils.TestUtils.randomUUID;
 import static org.zalando.nakadi.utils.TestUtils.randomValidStringOfLength;
 

diff --git a/src/acceptance-test/java/org/zalando/nakadi/repository/db/TimelineDbRepositoryTest.java b/src/acceptance-test/java/org/zalando/nakadi/repository/db/TimelineDbRepositoryTest.java
@@ -1,11 +1,5 @@
 package org.zalando.nakadi.repository.db;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
@@ -15,6 +9,14 @@
 import org.zalando.nakadi.domain.Timeline;
 import org.zalando.nakadi.exceptions.runtime.DuplicatedTimelineException;
 import org.zalando.nakadi.utils.TestUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
 import static org.zalando.nakadi.utils.TestUtils.randomUUID;
 
 public class TimelineDbRepositoryTest extends AbstractDbRepositoryTest {

diff --git a/src/acceptance-test/java/org/zalando/nakadi/repository/kafka/KafkaRepositoryAT.java b/src/acceptance-test/java/org/zalando/nakadi/repository/kafka/KafkaRepositoryAT.java
@@ -1,29 +1,15 @@
 package org.zalando.nakadi.repository.kafka;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import org.apache.curator.CuratorZookeeperClient;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.PartitionInfo;
 import org.echocat.jomon.runtime.concurrent.RetryForSpecifiedTimeStrategy;
-import static org.echocat.jomon.runtime.concurrent.Retryer.executeWithRetry;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.arrayWithSize;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.not;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.Matchers.any;
 import org.mockito.Mockito;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import org.zalando.nakadi.config.NakadiSettings;
 import org.zalando.nakadi.domain.BatchItem;
 import org.zalando.nakadi.domain.EventPublishingStatus;
@@ -33,6 +19,22 @@
 import org.zalando.nakadi.utils.TestUtils;
 import org.zalando.nakadi.webservice.BaseAT;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.echocat.jomon.runtime.concurrent.Retryer.executeWithRetry;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.arrayWithSize;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.not;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class KafkaRepositoryAT extends BaseAT {
 
     private static final int DEFAULT_PARTITION_COUNT = 8;

diff --git a/src/acceptance-test/java/org/zalando/nakadi/webservice/BlockEventPublishingAT.java b/src/acceptance-test/java/org/zalando/nakadi/webservice/BlockEventPublishingAT.java
@@ -1,21 +1,23 @@
 package org.zalando.nakadi.webservice;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import static com.jayway.restassured.RestAssured.given;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.response.Response;
-import java.io.IOException;
-import java.text.MessageFormat;
 import org.apache.http.HttpStatus;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.zalando.nakadi.domain.EventType;
 import org.zalando.nakadi.service.BlacklistService;
 import org.zalando.nakadi.utils.EventTypeTestBuilder;
-import static org.zalando.nakadi.utils.TestUtils.waitFor;
 import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
 
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import static com.jayway.restassured.RestAssured.given;
+import static org.zalando.nakadi.utils.TestUtils.waitFor;
+
 public class BlockEventPublishingAT extends BaseAT {
 
     private EventType eventType;

diff --git a/src/acceptance-test/java/org/zalando/nakadi/webservice/CursorOperationsAT.java b/src/acceptance-test/java/org/zalando/nakadi/webservice/CursorOperationsAT.java
@@ -3,15 +3,16 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.http.ContentType;
-import static org.hamcrest.core.IsEqual.equalTo;
 import org.junit.Before;
 import org.junit.Test;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
 import org.zalando.nakadi.domain.EventType;
 import org.zalando.nakadi.utils.EventTypeTestBuilder;
-import static org.zalando.nakadi.utils.TestUtils.randomTextString;
 import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
+import static org.zalando.nakadi.utils.TestUtils.randomTextString;
 import static org.zalando.nakadi.webservice.utils.NakadiTestUtils.postEvents;
 
 public class CursorOperationsAT {
@@ -199,7 +200,10 @@ public void unshiftCursor() {
                 .when()
                 .post("/event-types/" + eventType.getName() + "/shifted-cursors")
                 .then()
-                .statusCode(UNPROCESSABLE_ENTITY.value());
+                .statusCode(OK.value())
+                .body("size()", equalTo(1))
+                .body("offset[0]", equalTo("001-0001-000000000000000002"))
+                .body("partition[0]", equalTo("0"));
 
         NakadiTestUtils.switchTimelineDefaultStorage(eventType);
 

diff --git a/src/acceptance-test/java/org/zalando/nakadi/webservice/EventStreamReadingAT.java b/src/acceptance-test/java/org/zalando/nakadi/webservice/EventStreamReadingAT.java
@@ -4,13 +4,28 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
-import static com.jayway.restassured.RestAssured.given;
 import com.jayway.restassured.response.Header;
 import com.jayway.restassured.response.Response;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.zalando.nakadi.domain.EventType;
+import org.zalando.nakadi.domain.EventTypeStatistics;
+import org.zalando.nakadi.exceptions.NoSuchEventTypeException;
+import org.zalando.nakadi.repository.kafka.KafkaTestHelper;
+import org.zalando.nakadi.service.BlacklistService;
+import org.zalando.nakadi.utils.EventTypeTestBuilder;
+import org.zalando.nakadi.utils.TestUtils;
+import org.zalando.nakadi.view.Cursor;
+import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import static java.text.MessageFormat.format;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -22,28 +37,15 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+
+import static com.jayway.restassured.RestAssured.given;
+import static java.text.MessageFormat.format;
 import static java.util.stream.IntStream.range;
-import org.hamcrest.Matchers;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.zalando.nakadi.domain.EventType;
-import org.zalando.nakadi.domain.EventTypeStatistics;
-import org.zalando.nakadi.exceptions.NoSuchEventTypeException;
-import org.zalando.nakadi.repository.kafka.KafkaTestHelper;
-import org.zalando.nakadi.service.BlacklistService;
-import org.zalando.nakadi.utils.EventTypeTestBuilder;
-import org.zalando.nakadi.utils.TestUtils;
-import org.zalando.nakadi.view.Cursor;
-import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
 
 public class EventStreamReadingAT extends BaseAT {
 

diff --git a/src/acceptance-test/java/org/zalando/nakadi/webservice/EventTypeAT.java b/src/acceptance-test/java/org/zalando/nakadi/webservice/EventTypeAT.java
@@ -2,44 +2,46 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.ImmutableList;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.http.ContentType.JSON;
+import org.apache.http.HttpStatus;
+import org.joda.time.DateTime;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.zalando.nakadi.domain.EventType;
+import org.zalando.nakadi.domain.EventTypeAuthorization;
+import org.zalando.nakadi.domain.EventTypeAuthorizationAttribute;
+import org.zalando.nakadi.domain.Timeline;
+import org.zalando.nakadi.exceptions.NoSuchEventTypeException;
+import org.zalando.nakadi.partitioning.PartitionStrategy;
+import org.zalando.nakadi.repository.kafka.KafkaTestHelper;
+import org.zalando.nakadi.utils.EventTypeTestBuilder;
+import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
+import org.zalando.problem.MoreStatus;
+import org.zalando.problem.Problem;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import org.apache.http.HttpStatus;
+
+import static com.jayway.restassured.RestAssured.given;
+import static com.jayway.restassured.RestAssured.when;
+import static com.jayway.restassured.http.ContentType.JSON;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.IsEqual.equalTo;
-import org.joda.time.DateTime;
-import org.json.JSONObject;
-import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.zalando.nakadi.domain.EventType;
-import org.zalando.nakadi.domain.EventTypeAuthorization;
-import org.zalando.nakadi.domain.EventTypeAuthorizationAttribute;
-import org.zalando.nakadi.domain.Timeline;
-import org.zalando.nakadi.exceptions.NoSuchEventTypeException;
-import org.zalando.nakadi.partitioning.PartitionStrategy;
-import org.zalando.nakadi.repository.kafka.KafkaTestHelper;
-import org.zalando.nakadi.utils.EventTypeTestBuilder;
 import static org.zalando.nakadi.utils.TestUtils.buildDefaultEventType;
 import static org.zalando.nakadi.utils.TestUtils.resourceAsString;
 import static org.zalando.nakadi.utils.TestUtils.waitFor;
-import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
 import static org.zalando.nakadi.webservice.utils.NakadiTestUtils.publishEvent;
-import org.zalando.problem.MoreStatus;
-import org.zalando.problem.Problem;
 
 public class EventTypeAT extends BaseAT {
 

diff --git a/src/acceptance-test/java/org/zalando/nakadi/webservice/SettingsControllerAT.java b/src/acceptance-test/java/org/zalando/nakadi/webservice/SettingsControllerAT.java
@@ -2,12 +2,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import static com.jayway.restassured.RestAssured.given;
 import com.jayway.restassured.http.ContentType;
-import java.io.IOException;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.http.HttpStatus;
-import static org.hamcrest.Matchers.hasItems;
 import org.junit.Assert;
 import org.junit.Test;
 import org.zalando.nakadi.config.JsonConfig;
@@ -17,6 +14,11 @@
 import org.zalando.nakadi.webservice.utils.NakadiTestUtils;
 import org.zalando.nakadi.webservice.utils.ZookeeperTestUtils;
 
+import java.io.IOException;
+
+import static com.jayway.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.hasItems;
+
 public class SettingsControllerAT extends BaseAT {
 
     private static final String BLACKLIST_URL = "/settings/blacklist";