Merge pull request #789 from ChandraAddala/small-fix-empty-tokens

Removing check for empty tokens
rax-maas · Mar 2, 2017 · ef31767 · ef31767
2 parents e5b2c1a + 7105c45
commit ef31767
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/blueflood-core/src/test/java/com/rackspacecloud/blueflood/types/TokenTest.java b/blueflood-core/src/test/java/com/rackspacecloud/blueflood/types/TokenTest.java
@@ -69,7 +69,6 @@ public void testGetTokensHappyCase() {
                 tenantID + ":" + "a.b.c.d:$"};
 
         List<Token> tokens = Token.getTokens(locator);
-        tokens.forEach(System.out::println);
 
         verifyTokenInfos(tenantID, expectedTokens, expectedParents, expectedIds, tokens);
     }
@@ -89,6 +88,37 @@ public void testGetTokensForMetricWithOneToken() {
         verifyTokenInfos(tenantID, expectedTokens, expectedParents, expectedIds, tokens);
     }
 
+    @Test
+    public void testGetTokensWithEmptyTokenInBetween() {
+
+        String tenantID = "111111";
+        String metricName = "ingest00.HeaderNormalization.header-normalization..*_GET.count";
+        Locator locator = Locator.createLocatorFromPathComponents(tenantID, metricName);
+
+
+        String[] expectedTokens = new String[] {"ingest00", "HeaderNormalization", "header-normalization", "", "*_GET", "count"};
+
+        String[] expectedParents = new String[] {
+                "",
+                "ingest00",
+                "ingest00.HeaderNormalization",
+                "ingest00.HeaderNormalization.header-normalization",
+                "ingest00.HeaderNormalization.header-normalization.",
+                "ingest00.HeaderNormalization.header-normalization..*_GET"};
+
+        String[] expectedIds = new String[] {
+                tenantID + ":" + "ingest00",
+                tenantID + ":" + "ingest00.HeaderNormalization",
+                tenantID + ":" + "ingest00.HeaderNormalization.header-normalization",
+                tenantID + ":" + "ingest00.HeaderNormalization.header-normalization.",
+                tenantID + ":" + "ingest00.HeaderNormalization.header-normalization..*_GET",
+                tenantID + ":" + "ingest00.HeaderNormalization.header-normalization..*_GET.count:$"};
+
+        List<Token> tokens = Token.getTokens(locator);
+
+        verifyTokenInfos(tenantID, expectedTokens, expectedParents, expectedIds, tokens);
+    }
+
     @Test
     public void testGetTokensForMetricNoTokens() {
 

diff --git a/blueflood-elasticsearch/src/main/java/com/rackspacecloud/blueflood/io/ElasticTokensIO.java b/blueflood-elasticsearch/src/main/java/com/rackspacecloud/blueflood/io/ElasticTokensIO.java
@@ -100,10 +100,6 @@ public void insertDiscovery(List<Token> tokens) throws IOException {
 
     IndexRequestBuilder createSingleRequest(Token token) throws IOException {
 
-        if (StringUtils.isEmpty(token.getToken())) {
-            throw new IllegalArgumentException("trying to insert token discovery without a token: " + token.getLocator());
-        }
-
         return client.prepareIndex(ELASTICSEARCH_TOKEN_INDEX_NAME_WRITE, ES_DOCUMENT_TYPE)
                 .setId(token.getId())
                 .setSource(createSourceContent(token))