Modified according to rick's comments

yahoo · Jan 18, 2017 · 2104fd0 · 2104fd0
1 parent 9fbf86e
commit 2104fd0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/fili-navi/src/main/java/com/yahoo/bard/webservice/data/dimension/Tag.java b/fili-navi/src/main/java/com/yahoo/bard/webservice/data/dimension/Tag.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * An interface for tag.
+ * Interface for tags used for tagging dimension fields to add additional properties implicitly specified by its name.
  */
 public interface Tag {
 

diff --git a/fili-navi/src/main/java/com/yahoo/bard/webservice/data/dimension/TaggedDimensionField.java b/fili-navi/src/main/java/com/yahoo/bard/webservice/data/dimension/TaggedDimensionField.java
@@ -5,12 +5,12 @@
 import java.util.Set;
 
 /**
- * Dimension field with tags.
+ * Interface for Dimension fields that expects unique tags to be attached to it to add expressiveness.
  */
 public interface TaggedDimensionField extends DimensionField {
 
     /**
-     * Get a list of tags associated to the current field.
+     * Get a set of tags associated to the current field.
      *
      * @return a list of tags
      */

diff --git a/...src/main/java/com/yahoo/bard/webservice/data/dimension/impl/DefaultDimensionFieldTag.java b/...src/main/java/com/yahoo/bard/webservice/data/dimension/impl/DefaultDimensionFieldTag.java
@@ -3,13 +3,15 @@
 package com.yahoo.bard.webservice.data.dimension.impl;
 
 import com.yahoo.bard.webservice.data.dimension.Tag;
-
-import java.util.Locale;
+import com.yahoo.bard.webservice.util.EnumUtils;
 
 /**
- * Default dimension field tag provided in fili-navi to match fili-core concept "key" field.
+ * Default dimension field tag provided to match fili core concepts.
  */
 public enum DefaultDimensionFieldTag implements Tag {
+    /**
+     * Dimension field tag to match fili concept of a "key" field.
+     */
     PRIMARY_KEY
     ;
 
@@ -19,7 +21,7 @@ public enum DefaultDimensionFieldTag implements Tag {
      * Constructor, build name using camel cased enum name.
      */
     DefaultDimensionFieldTag() {
-        this.tagName = name().toLowerCase(Locale.ENGLISH);
+        this.tagName = EnumUtils.camelCase(name());
     }
 
     @Override

diff --git a/.../src/test/groovy/com/yahoo/bard/webservice/data/dimension/TaggedDimensionFieldSpec.groovy b/.../src/test/groovy/com/yahoo/bard/webservice/data/dimension/TaggedDimensionFieldSpec.groovy
@@ -24,7 +24,7 @@ class TaggedDimensionFieldSpec extends Specification {
         objectMapper = new ObjectMapper()
 
         mockTag = Mock(Tag)
-        mockTag.getName() >> "mock_tag"
+        mockTag.getName() >> "mockTag"
 
         noTagField = TEST_NO_TAG
         oneTagField = TEST_ONE_TAG
@@ -46,7 +46,7 @@ class TaggedDimensionFieldSpec extends Specification {
     def "Tagged dimension fields serialize as expected"() {
         expect:
         objectMapper.writeValueAsString(noTagField) == '{"name":"testNoTag","tags":[],"description":"testNoTag description"}'
-        objectMapper.writeValueAsString(oneTagField) == '{"name":"testOneTag","tags":["primary_key"],"description":"testOneTag description"}'
-        objectMapper.writeValueAsString(twoTagField) == '{"name":"testTwoTag","tags":["primary_key","mock_tag"],"description":"testTwoTag description"}'
+        objectMapper.writeValueAsString(oneTagField) == '{"name":"testOneTag","tags":["primaryKey"],"description":"testOneTag description"}'
+        objectMapper.writeValueAsString(twoTagField) == '{"name":"testTwoTag","tags":["primaryKey","mockTag"],"description":"testTwoTag description"}'
     }
 }