Changed type of goalId from string to integer

Author: bcsorba

src/com/ge/corporate/piwik/tracking/PiwikRequest.java

@@ -436,15 +436,15 @@ public void setDownloadUrl(URL downloadUrl){
      * cart update or an ecommerce order.
      */
     public void enableEcommerce(){
-        setGoalId("0");
+        setGoalId(0);
     }
 
     /**
      * Verifies that Ecommerce has been enabled for the request.  Will throw an
      * {@link IllegalStateException} if not.
      */
     public void verifyEcommerceEnabled(){
-        if (!"0".equals(getGoalId())){
+        if (getGoalId() == null || getGoalId() != 0){
             throw new IllegalStateException("GoalId must be \"0\".  Try calling enableEcommerce first before calling this method.");
         }
     }
@@ -680,16 +680,16 @@ public void setEventValue(Number eventValue){
      * Get the goal id
      * @return the goal id
      */
-    public String getGoalId(){
-        return (String)getParameter(GOAL_ID);
+    public Integer getGoalId(){
+        return (Integer)getParameter(GOAL_ID);
     }
 
     /**
      * Set the goal id.  If specified, the tracking request will trigger a 
      * conversion for the goal of the website being tracked with this id.
      * @param goalId the goal id to set
      */
-    public void setGoalId(String goalId){
+    public void setGoalId(Integer goalId){
         setParameter(GOAL_ID, goalId);
     }
 
@@ -1052,8 +1052,8 @@ public String getSearchCategory(){
     }
 
     /**
-     * When <strong>Query</strong> is specified, you can optionally specify a search category
-     * with this parameter.
+     * Specify a search category with this parameter.  SearchQuery must first be
+     * set.
      * @param searchCategory the search category to set
      */
     public void setSearchCategory(String searchCategory){
@@ -1089,10 +1089,10 @@ public Long getSearchResultsCount(){
     }
 
     /**
-     * When <strong>Query</strong> is specified, we also recommend to set the 
+     * We recommend to set the 
      * search count to the number of search results displayed on the results page. 
      * When keywords are tracked with {@code Search Results Count=0} they will appear in 
-     * the "No Result Search Keyword" report.
+     * the "No Result Search Keyword" report.  SearchQuery must first be set.
      * @param searchResultsCount the search results count to set
      */
     public void setSearchResultsCount(Long searchResultsCount){

test/com/ge/corporate/piwik/tracking/PiwikRequestTest.java

@@ -263,7 +263,7 @@ public void testDownloadUrl() throws Exception{
     @Test
     public void testEnableEcommerce(){
         request.enableEcommerce();
-        assertEquals("0", request.getGoalId());
+        assertEquals(new Integer(0), request.getGoalId());
     }
 
     /**
@@ -548,16 +548,16 @@ public void testEventName(){
     @Test
     public void testEventValue(){
         request.setEventValue(1);
-        assertEquals(new Integer(1), request.getEventValue());
+        assertEquals(1, request.getEventValue());
     }
 
     /**
      * Test of getGoalId method, of class PiwikRequest.
      */
     @Test
     public void testGoalId(){
-        request.setGoalId("id");
-        assertEquals("id", request.getGoalId());
+        request.setGoalId(1);
+        assertEquals(new Integer(1), request.getGoalId());
     }
 
     /**
@@ -576,7 +576,7 @@ public void testGoalRevenueT(){
     }
     @Test
     public void testGoalRevenue(){
-        request.setGoalId("id");
+        request.setGoalId(1);
         request.setGoalRevenue(20.0);
 
         assertEquals(new Double(20.0), request.getGoalRevenue());