Adding Dependency Tracking Ability

ApplicationInsights/Channel/Contracts/Application.php

@@ -2,25 +2,27 @@
 namespace ApplicationInsights\Channel\Contracts;
 
 /**
-* Data contract class for type Application. 
+* Data contract class for type Application.
 */
 class Application
 {
+    use Json_Serializer;
+
     /**
-    * Data array that will store all the values. 
+    * Data array that will store all the values.
     */
     private $_data;
 
     /**
-    * Creates a new Application. 
+    * Creates a new Application.
     */
     function __construct()
     {
         $this->_data = array();
     }
 
     /**
-    * Gets the ver field. 
+    * Gets the ver field.
     */
     public function getVer()
     {
@@ -29,18 +31,10 @@ public function getVer()
     }
 
     /**
-    * Sets the ver field. 
+    * Sets the ver field.
     */
     public function setVer($ver)
     {
         $this->_data['ai.application.ver'] = $ver;
     }
-
-    /**
-    * Overrides JSON serialization for this class. 
-    */
-    public function jsonSerialize()
-    {
-        return Utils::removeEmptyValues($this->_data);
-    }
 }

ApplicationInsights/Channel/Contracts/Base_Data.php

@@ -0,0 +1,59 @@
+<?php
+namespace ApplicationInsights\Channel\Contracts;
+
+/**
+* Data contract class for type Event_Data.
+*/
+abstract class Base_Data implements Data_Interface
+{
+    use Json_Serializer;
+    use Version_Manager;
+
+    /**
+    * Data array that will store all the values.
+    */
+    protected $_data;
+
+    /**
+    * Needed to properly construct the JSON envelope.
+    */
+    protected $_envelopeTypeName;
+
+    /**
+    * Needed to properly construct the JSON envelope.
+    */
+    protected $_dataTypeName;
+
+    /**
+    * Gets the envelopeTypeName field.
+    */
+    public function getEnvelopeTypeName()
+    {
+        return $this->_envelopeTypeName;
+    }
+
+    /**
+    * Gets the dataTypeName field.
+    */
+    public function getDataTypeName()
+    {
+        return $this->_dataTypeName;
+    }
+
+    /**
+    * Gets the properties field.
+    */
+    public function getProperties()
+    {
+        if (array_key_exists('properties', $this->_data)) { return $this->_data['properties']; }
+        return NULL;
+    }
+
+    /**
+    * Sets the properties field.
+    */
+    public function setProperties($properties)
+    {
+        $this->_data['properties'] = $properties;
+    }
+}

ApplicationInsights/Channel/Contracts/Data.php

@@ -2,25 +2,27 @@
 namespace ApplicationInsights\Channel\Contracts;
 
 /**
-* Data contract class for type Data. 
+* Data contract class for type Data.
 */
 class Data
 {
+    use Json_Serializer;
+
     /**
-    * Data array that will store all the values. 
+    * Data array that will store all the values.
     */
     private $_data;
 
     /**
-    * Creates a new Data. 
+    * Creates a new Data.
     */
     function __construct()
     {
         $this->_data['baseData'] = NULL;
     }
 
     /**
-    * Gets the baseType field. 
+    * Gets the baseType field.
     */
     public function getBaseType()
     {
@@ -29,15 +31,15 @@ public function getBaseType()
     }
 
     /**
-    * Sets the baseType field. 
+    * Sets the baseType field.
     */
     public function setBaseType($baseType)
     {
         $this->_data['baseType'] = $baseType;
     }
 
     /**
-    * Gets the baseData field. 
+    * Gets the baseData field.
     */
     public function getBaseData()
     {
@@ -46,18 +48,10 @@ public function getBaseData()
     }
 
     /**
-    * Sets the baseData field. 
+    * Sets the baseData field.
     */
     public function setBaseData($baseData)
     {
         $this->_data['baseData'] = $baseData;
     }
-
-    /**
-    * Overrides JSON serialization for this class. 
-    */
-    public function jsonSerialize()
-    {
-        return Utils::removeEmptyValues($this->_data);
-    }
 }

ApplicationInsights/Channel/Contracts/Data_Interface.php

@@ -0,0 +1,43 @@
+<?php
+namespace ApplicationInsights\Channel\Contracts;
+
+/**
+* Interface class for XXXXX_Data.
+*/
+interface Data_Interface
+{
+    /**
+    * Gets the envelopeTypeName field.
+    */
+    public function getEnvelopeTypeName();
+
+    /**
+    * Gets the dataTypeName field.
+    */
+    public function getDataTypeName();
+
+    /**
+    * Gets the ver field.
+    */
+    public function getVer();
+
+    /**
+    * Sets the ver field.
+    */
+    public function setVer($ver);
+
+    /**
+    * Gets the properties field.
+    */
+    public function getProperties();
+
+    /**
+    * Sets the properties field.
+    */
+    public function setProperties($properties);
+
+    /**
+    * JSON serialization for this class.
+    */
+    public function jsonSerialize();
+}

ApplicationInsights/Channel/Contracts/Data_Point.php

@@ -2,17 +2,19 @@
 namespace ApplicationInsights\Channel\Contracts;
 
 /**
-* Data contract class for type Data_Point. 
+* Data contract class for type Data_Point.
 */
 class Data_Point
 {
+    use Json_Serializer;
+
     /**
-    * Data array that will store all the values. 
+    * Data array that will store all the values.
     */
     private $_data;
 
     /**
-    * Creates a new DataPoint. 
+    * Creates a new DataPoint.
     */
     function __construct()
     {
@@ -22,7 +24,7 @@ function __construct()
     }
 
     /**
-    * Gets the name field. 
+    * Gets the name field.
     */
     public function getName()
     {
@@ -31,15 +33,15 @@ public function getName()
     }
 
     /**
-    * Sets the name field. 
+    * Sets the name field.
     */
     public function setName($name)
     {
         $this->_data['name'] = $name;
     }
 
     /**
-    * Gets the kind field. 
+    * Gets the kind field.
     */
     public function getKind()
     {
@@ -48,15 +50,15 @@ public function getKind()
     }
 
     /**
-    * Sets the kind field. 
+    * Sets the kind field.
     */
     public function setKind($kind)
     {
         $this->_data['kind'] = $kind;
     }
 
     /**
-    * Gets the value field. 
+    * Gets the value field.
     */
     public function getValue()
     {
@@ -65,15 +67,15 @@ public function getValue()
     }
 
     /**
-    * Sets the value field. 
+    * Sets the value field.
     */
     public function setValue($value)
     {
         $this->_data['value'] = $value;
     }
 
     /**
-    * Gets the count field. 
+    * Gets the count field.
     */
     public function getCount()
     {
@@ -82,15 +84,15 @@ public function getCount()
     }
 
     /**
-    * Sets the count field. 
+    * Sets the count field.
     */
     public function setCount($count)
     {
         $this->_data['count'] = $count;
     }
 
     /**
-    * Gets the min field. 
+    * Gets the min field.
     */
     public function getMin()
     {
@@ -99,15 +101,15 @@ public function getMin()
     }
 
     /**
-    * Sets the min field. 
+    * Sets the min field.
     */
     public function setMin($min)
     {
         $this->_data['min'] = $min;
     }
 
     /**
-    * Gets the max field. 
+    * Gets the max field.
     */
     public function getMax()
     {
@@ -116,15 +118,15 @@ public function getMax()
     }
 
     /**
-    * Sets the max field. 
+    * Sets the max field.
     */
     public function setMax($max)
     {
         $this->_data['max'] = $max;
     }
 
     /**
-    * Gets the stdDev field. 
+    * Gets the stdDev field.
     */
     public function getStdDev()
     {
@@ -133,18 +135,10 @@ public function getStdDev()
     }
 
     /**
-    * Sets the stdDev field. 
+    * Sets the stdDev field.
     */
     public function setStdDev($stdDev)
     {
         $this->_data['stdDev'] = $stdDev;
     }
-
-    /**
-    * Overrides JSON serialization for this class. 
-    */
-    public function jsonSerialize()
-    {
-        return Utils::removeEmptyValues($this->_data);
-    }
 }