balint777 / POData

src/POData/HttpProcessUtility.php

Doc Comments +2 added lines, -2 removed lines

@@ -477,7 +477,7 @@ 
     /**
      * To check whether the given character is a HTTP seperator character.
      *
-     * @param char $char The character to inspect.
+     * @param string $char The character to inspect.
      *
      * @return boolean True if the given character is a valid HTTP seperator
      *                 character, False otherwise.
@@ -687,7 +687,7 @@ 
      * Verifies whether the specified character is a valid separator in
        an HTTP header list of element.
      *
-     * @param char $c Character to verify
+     * @param string $c Character to verify
      *
      * @return boolean true if c is a valid character for separating elements;
      *                 false otherwise.

Indentation +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
                 //the rest look like QSPs..kinda so we can do this
                 parse_str(implode("&", $candidateParts), $candidateParts);
                 if (array_key_exists('odata', $candidateParts)) {
-                   $candidateODataValue = $candidateParts['odata'];
+                    $candidateODataValue = $candidateParts['odata'];
                 }
             }
 

src/POData/Writers/Metadata/MetadataWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
      * Write an entity type and associated attributes.
      *
      * @param ResourceType $resourceType                            Resource type
-     * @param array        $associationTypesInResourceTypeNamespace Collection of
+     * @param ResourceAssociationType[]        $associationTypesInResourceTypeNamespace Collection of
      * association types for the given resource types
      * array(string, AssociationType)
      *

Indentation -1 removed lines

@@ -187,7 +187,6 @@
      * Write all resource types (entity and complex types)
      *
      * @param ResourceType[] $resourceTypes resource types array
-
      * @param ResourceAssociationType[] $associationTypesInResourceTypesNamespace collection of
      * association types for the given resource types
      * array(string, AssociationType)

src/POData/Common/Version.php

Spacing +7 added lines, -7 removed lines

@@ -122,12 +122,12 @@ 
     /** @var Version[] */
     private static $fixedVersion;
 
-    private static function fillVersions(){
-        if(is_null(self::$fixedVersion)){
+    private static function fillVersions() {
+        if (is_null(self::$fixedVersion)) {
             self::$fixedVersion = array(
-                1 => new Version(1,0),
-                2 => new Version(2,0),
-                3 => new Version(3,0),
+                1 => new Version(1, 0),
+                2 => new Version(2, 0),
+                3 => new Version(3, 0),
             );
         }
     }
@@ -139,13 +139,13 @@ 
     }
 
 
-    public static function v2(){
+    public static function v2() {
         self::fillVersions();
         return self::$fixedVersion[2];
     }
 
 
-    public static function v3(){
+    public static function v3() {
         self::fillVersions();
         return self::$fixedVersion[3];
     }

src/POData/BaseService.php

Spacing +11 added lines, -11 removed lines

@@ -317,11 +317,11 @@ 
         $registry->register(new JsonODataV1Writer());
         $registry->register(new AtomODataWriter($serviceURI));
 
-        if($serviceVersion->compare(Version::v2()) > -1){
+        if ($serviceVersion->compare(Version::v2()) > -1) {
             $registry->register(new JsonODataV2Writer());
         }
 
-        if($serviceVersion->compare(Version::v3()) > -1){
+        if ($serviceVersion->compare(Version::v3()) > -1) {
             $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::NONE(), $serviceURI));
             $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::MINIMAL(), $serviceURI));
             $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::FULL(), $serviceURI));
@@ -352,7 +352,7 @@ 
 
         if (is_null($responseContentType) && $request->getTargetKind() != TargetKind::MEDIA_RESOURCE()) {
             //the responseContentType can ONLY be null if it's a stream (media resource) and that stream is storing null as the content type
-            throw new ODataException( Messages::unsupportedMediaType(), 415 );
+            throw new ODataException(Messages::unsupportedMediaType(), 415);
         }
 
         $odataModelInstance = null;
@@ -529,10 +529,10 @@ 
 
         //if the $format header is present it overrides the accepts header
         $format = $host->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FORMAT);
-        if(!is_null($format)){
+        if (!is_null($format)) {
 
             //There's a strange edge case..if application/json is supplied and it's V3
-            if($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()){
+            if ($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()) {
                 //then it's actual minimalmetadata
                 //TODO: should this be done with the header text too?
                 $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
@@ -548,7 +548,7 @@ 
         //getTargetKind doesn't deal with link resources directly and this can change things
         $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind();
 
-        switch($targetKind){
+        switch ($targetKind) {
             case TargetKind::METADATA():
                 return HttpProcessUtility::selectMimeType(
                     $requestAcceptText,
@@ -626,7 +626,7 @@ 
                 );
 
             case TargetKind::MEDIA_RESOURCE():
-                if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()){
+                if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()) {
                     throw ODataException::createBadRequestError(
                         Messages::badRequestInvalidUriForMediaResource(
                             $host->getAbsoluteRequestUri()->getUrlAsString()
@@ -660,7 +660,7 @@ 
 
 
         //If we got here, we just don't know what it is...
-        throw new ODataException( Messages::unsupportedMediaType(), 415 );
+        throw new ODataException(Messages::unsupportedMediaType(), 415);
 
     }
 
@@ -790,16 +790,16 @@ 
             try {
 
                 //TODO #88...also this seems like dupe work
-                $reflectionProperty  = new \ReflectionProperty($entryObject, $eTagProperty->getName() );
+                $reflectionProperty = new \ReflectionProperty($entryObject, $eTagProperty->getName());
                 $value = $reflectionProperty->getValue($entryObject);
             } catch (\ReflectionException $reflectionException) {
                 throw ODataException::createInternalServerError(
-                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName() )
+                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName())
                 );
             }
 
             if (is_null($value)) {
-                $eTag = $eTag . $comma. 'null';
+                $eTag = $eTag . $comma . 'null';
             } else {
                 $eTag = $eTag . $comma . $type->convertToOData($value);
             }

src/POData/Providers/Expression/PHPExpressionProvider.php

Spacing +6 added lines, -7 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function onLogicalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::AND_LOGICAL:
                 return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
 
@@ -116,7 +116,7 @@ 
      */
     public function onArithmeticExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::MULTIPLY:
                 return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
 
@@ -148,7 +148,7 @@ 
      */
     public function onRelationalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::GREATERTHAN:
                 return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right);
 
@@ -182,7 +182,7 @@ 
      */
     public function onUnaryExpression($expressionType, $child)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::NEGATE:
                 return $this->_prepareUnaryExpression(self::NEGATE, $child);
 
@@ -245,7 +245,7 @@ 
      */
     public function onFunctionCallExpression($functionDescription, $params)
     {
-        switch($functionDescription->name) {
+        switch ($functionDescription->name) {
             case ODataConstants::STRFUN_COMPARE:
                 return "strcmp($params[0], $params[1])";
 
@@ -272,8 +272,7 @@ 
 
             case ODataConstants::STRFUN_SUBSTRING:
                 return count($params) == 3 ?
-                    "substr($params[0], $params[1], $params[2])" :
-                    "substr($params[0], $params[1])";
+                    "substr($params[0], $params[1], $params[2])" : "substr($params[0], $params[1])";
 
             case ODataConstants::STRFUN_SUBSTRINGOF:
                 return "(strpos($params[1], $params[0]) !== false)";

src/POData/Providers/Expression/MySQLExpressionProvider.php

Spacing +12 added lines, -13 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function onLogicalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::AND_LOGICAL:
                 return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
 
@@ -107,7 +107,7 @@ 
      */
     public function onArithmeticExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::MULTIPLY:
                 return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
 
@@ -139,7 +139,7 @@ 
      */
     public function onRelationalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::GREATERTHAN:
                 return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right);
 
@@ -173,7 +173,7 @@ 
      */
     public function onUnaryExpression($expressionType, $child)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
             case ExpressionType::NEGATE:
                 return $this->_prepareUnaryExpression(self::NEGATE, $child);
 
@@ -239,7 +239,7 @@ 
      */
     public function onFunctionCallExpression($functionDescription, $params)
     {
-        switch($functionDescription->name) {
+        switch ($functionDescription->name) {
             case ODataConstants::STRFUN_COMPARE:
                 return "STRCMP($params[0], $params[1])";
 
@@ -266,8 +266,7 @@ 
 
             case ODataConstants::STRFUN_SUBSTRING:
                 return count($params) == 3 ?
-                    "SUBSTRING($params[0], $params[1] + 1, $params[2])" :
-                    "SUBSTRING($params[0], $params[1] + 1)";
+                    "SUBSTRING($params[0], $params[1] + 1, $params[2])" : "SUBSTRING($params[0], $params[1] + 1)";
 
             case ODataConstants::STRFUN_SUBSTRINGOF:
                 return "(LOCATE($params[0], $params[1]) > 0)";
@@ -285,22 +284,22 @@ 
                 return "DATETIMECMP($params[0]; $params[1])";
 
             case ODataConstants::DATETIME_YEAR:
-                return "EXTRACT(YEAR from ".$params[0].")";
+                return "EXTRACT(YEAR from " . $params[0] . ")";
 
             case ODataConstants::DATETIME_MONTH:
-                return "EXTRACT(MONTH from ".$params[0].")";
+                return "EXTRACT(MONTH from " . $params[0] . ")";
 
             case ODataConstants::DATETIME_DAY:
-                return "EXTRACT(DAY from ".$params[0].")";
+                return "EXTRACT(DAY from " . $params[0] . ")";
 
             case ODataConstants::DATETIME_HOUR:
-                return "EXTRACT(HOUR from ".$params[0].")";
+                return "EXTRACT(HOUR from " . $params[0] . ")";
 
             case ODataConstants::DATETIME_MINUTE:
-                return "EXTRACT(MINUTE from ".$params[0].")";
+                return "EXTRACT(MINUTE from " . $params[0] . ")";
 
             case ODataConstants::DATETIME_SECOND:
-                return "EXTRACT(SECOND from ".$params[0].")";
+                return "EXTRACT(SECOND from " . $params[0] . ")";
 
             case ODataConstants::MATHFUN_ROUND:
                 return "ROUND($params[0])";

src/POData/Providers/ProvidersWrapper.php

Indentation +956 added lines, -956 removed lines

@@ -32,960 +32,960 @@
  */
 class ProvidersWrapper
 {
-	/**
-	 * Holds reference to IMetadataProvider implementation
-	 *
-	 * @var IMetadataProvider
-	 */
-	private $metaProvider;
-
-	/**
-	 * Holds reference to IQueryProvider implementation
-	 *
-	 * @var IQueryProvider
-	 *
-	 */
-	private $queryProvider;
-
-	/**
-	 * Holds reference to IServiceConfiguration implementation
-	 *
-	 * @var ServiceConfiguration
-	 */
-	private $config;
-
-
-	/**
-	 * Cache for ResourceProperties of a resource type that belongs to a
-	 * resource set. An entry (ResourceProperty collection) in this cache
-	 * contains only the visible properties of ResourceType.
-	 *
-	 * @var array(string, array(string, ResourceProperty))
-	 */
-	private $propertyCache;
-
-	/**
-	 * Cache for ResourceSetWrappers. If ResourceSet is invisible value will
-	 * be null.
-	 *
-	 * @var ResourceSetWrapper[] indexed by resource set name
-	 */
-	private $setWrapperCache;
-
-	/**
-	 * Cache for ResourceTypes
-	 *
-	 * @var ResourceType[] indexed by resource type name
-	 */
-	private $typeCache;
-
-	/**
-	 * Cache for ResourceAssociationSet. If ResourceAssociationSet is invisible
-	 * value will be null.
-	 *
-	 * @var ResourceAssociationSet[] indexed by name
-	 */
-	private $associationSetCache;
-
-	/**
-	 * Creates a new instance of ProvidersWrapper
-	 *
-	 * @param IMetadataProvider $metadataProvider Reference to IMetadataProvider implementation
-	 * @param IQueryProvider    $queryProvider    Reference to IQueryProvider implementation
-	 * @param ServiceConfiguration    $configuration    Reference to IServiceConfiguration implementation
-	 */
-	public function __construct(IMetadataProvider $metadataProvider, IQueryProvider $queryProvider, ServiceConfiguration $configuration)
-	{
-		$this->metaProvider = $metadataProvider;
-		$this->queryProvider = $queryProvider;
-		$this->config = $configuration;
-		$this->setWrapperCache = array();
-		$this->typeCache = array();
-		$this->associationSetCache = array();
-		$this->propertyCache = array();
-	}
-
-	//Wrappers for IMetadataProvider methods
-
-	/**
-	 * To get the Container name for the data source,
-	 * Note: Wrapper for IMetadataProvider::getContainerName method
-	 * implementation
-	 *
-	 * @return string that contains the name of the container
-	 *
-	 * @throws ODataException Exception if implementation returns empty container name
-	 *
-	 */
-	public function getContainerName()
-	{
-		$containerName = $this->metaProvider->getContainerName();
-		if (empty($containerName)) {
-			throw new ODataException(
-				Messages::providersWrapperContainerNameMustNotBeNullOrEmpty(),
-				500
-			);
-		}
-
-		return $containerName;
-	}
-
-	/**
-	 * To get Namespace name for the data source,
-	 * Note: Wrapper for IMetadataProvider::getContainerNamespace method implementation
-	 *
-	 * @return string that contains the namespace name.
-	 *
-	 * @throws ODataException Exception if implementation returns empty container namespace
-	 *
-	 */
-	public function getContainerNamespace()
-	{
-		$containerNamespace = $this->metaProvider->getContainerNamespace();
-		if (empty($containerNamespace)) {
-			throw new ODataException(
-				Messages::providersWrapperContainerNamespaceMustNotBeNullOrEmpty(),
-				500
-			);
-		}
-
-		return $containerNamespace;
-	}
-
-	/**
-	 * To get the data service configuration
-	 *
-	 * @return ServiceConfiguration
-	 */
-	public function getConfiguration()
-	{
-		return $this->config;
-	}
-
-	/**
-	 *  To get all entity set information,
-	 *  Note: Wrapper for IMetadataProvider::getResourceSets method implementation,
-	 *  This method returns array of ResourceSetWrapper instances but the corresponding IDSMP method returns array of ResourceSet instances
-	 *
-	 *  @return ResourceSetWrapper[] The ResourceSetWrappers for the visible ResourceSets
-	 *  @throws ODataException when two resource sets with the same name are encountered
-	 *
-	 */
-	public function getResourceSets()
-	{
-		$resourceSets = $this->metaProvider->getResourceSets();
-		$resourceSetWrappers = array();
-		$resourceSetNames = array();
-		foreach ($resourceSets as $resourceSet) {
-			$name = $resourceSet->getName();
-			if (in_array($name, $resourceSetNames)) {
-				throw new ODataException(Messages::providersWrapperEntitySetNameShouldBeUnique($name), 500);
-			}
-
-			$resourceSetNames[] = $name;
-			$resourceSetWrapper = $this->_validateResourceSetAndGetWrapper($resourceSet);
-			if (!is_null($resourceSetWrapper)) {
-				$resourceSetWrappers[] = $resourceSetWrapper;
-			}
-		}
-
-		return $resourceSetWrappers;
-	}
-
-	/**
-	 * To get all resource types in the data source,
-	 * Note: Wrapper for IMetadataProvider::getTypes method implementation
-	 *
-	 * @return ResourceType[]
-	 */
-	public function getTypes()
-	{
-		$resourceTypes = $this->metaProvider->getTypes();
-		$resourceTypeNames = array();
-		foreach ($resourceTypes as $resourceType) {
-			if (in_array($resourceType->getName(), $resourceTypeNames)) {
-				throw new ODataException(
-					Messages::providersWrapperEntityTypeNameShouldBeUnique($resourceType->getName()),
-					500
-				);
-			}
-
-			$resourceTypeNames[] = $resourceType->getName();
-			$this->_validateResourceType($resourceType);
-		}
-
-		return $resourceTypes;
-	}
-
-	/**
-	 * To get a resource set based on the specified resource set name which is
-	 * visible,
-	 * Note: Wrapper for IMetadataProvider::resolveResourceSet method
-	 * implementation
-	 *
-	 * @param string $name Name of the resource set
-	 *
-	 * @return ResourceSetWrapper|null Returns resource set with the given name if found, NULL if resource set is set to invisible or not found
-	 *
-	 */
-	public function resolveResourceSet($name)
-	{
-		if (array_key_exists($name, $this->setWrapperCache)) {
-			return $this->setWrapperCache[$name];
-		}
-
-		$resourceSet = $this->metaProvider->resolveResourceSet($name);
-		if (is_null($resourceSet)) {
-			return null;
-		}
-
-		return $this->_validateResourceSetAndGetWrapper($resourceSet);
-	}
-
-	/**
-	 * To get a resource type based on the resource set name,
-	 * Note: Wrapper for IMetadataProvider::resolveResourceType
-	 * method implementation
-	 *
-	 * @param string $name Name of the resource set
-	 *
-	 * @return ResourceType|null resource type with the given resource set name if found else NULL
-	 *
-	 *
-	 * @throws ODataException If the ResourceType is invalid
-	 */
-	public function resolveResourceType($name)
-	{
-		$resourceType = $this->metaProvider->resolveResourceType($name);
-		if (is_null($resourceType)) {
-			return null;
-		}
-
-		return $this->_validateResourceType($resourceType);
-	}
-
-	/**
-	 * The method must return a collection of all the types derived from
-	 * $resourceType The collection returned should NOT include the type
-	 * passed in as a parameter
-	 * Note: Wrapper for IMetadataProvider::getDerivedTypes
-	 * method implementation
-	 *
-	 * @param ResourceType $resourceType Resource to get derived resource types from
-	 *
-	 * @return ResourceType[]
-	 *
-	 * @throws InvalidOperationException when the meat provider doesn't return an array
-	 */
-	public function getDerivedTypes(ResourceType $resourceType)
-	{
-		$derivedTypes = $this->metaProvider->getDerivedTypes($resourceType);
-		if (!is_array($derivedTypes)) {
-			throw new InvalidOperationException(Messages::metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceType->getName()));
-		}
-
-		foreach ($derivedTypes as $derivedType) {
-			$this->_validateResourceType($derivedType);
-		}
-
-		return $derivedTypes;
-	}
-
-	/**
-	 * Returns true if $resourceType represents an Entity Type which has derived
-	 * Entity Types, else false.
-	 * Note: Wrapper for IMetadataProvider::hasDerivedTypes method
-	 * implementation
-	 *
-	 * @param ResourceType $resourceType Resource to check for derived resource
-	 *                                   types.
-	 *
-	 * @return boolean
-	 *
-	 * @throws ODataException If the ResourceType is invalid
-	 */
-	public function hasDerivedTypes(ResourceType $resourceType)
-	{
-		$this->_validateResourceType($resourceType);
-		return $this->metaProvider->hasDerivedTypes($resourceType);
-	}
-
-	/**
-	 * Gets the ResourceAssociationSet instance for the given source association end,
-	 * Note: Wrapper for IMetadataProvider::getResourceAssociationSet
-	 * method implementation
-	 *
-	 * @param ResourceSet $set Resource set of the source association end
-	 * @param ResourceType       $type       Resource type of the source association end
-	 * @param ResourceProperty   $property   Resource property of the source association end
-	 *
-	 *
-	 * @return ResourceAssociationSet|null Returns ResourceAssociationSet for the source
-	 *                                             association end, NULL if no such
-	 *                                             association end or resource set in the
-	 *                                             other end of the association is invisible
-	 */
-	public function getResourceAssociationSet(
-		ResourceSet $set,
-		ResourceType $type,
-		ResourceProperty $property
-	) {
-		$type = $this->_getResourceTypeWherePropertyIsDeclared($type, $property);
-		$cacheKey = $set->getName() . '_' . $type->getName() . '_' . $property->getName();
-
-		if (array_key_exists($cacheKey, $this->associationSetCache)) {
-			return $this->associationSetCache[$cacheKey];
-		}
-
-		$associationSet = $this->metaProvider->getResourceAssociationSet(
-			$set,
-			$type,
-			$property
-		);
-
-		if (!is_null($associationSet)) {
-			$thisAssociationSetEnd = $associationSet->getResourceAssociationSetEnd(
-				$set,
-				$type,
-				$property
-			);
-
-			$relatedAssociationSetEnd = $associationSet->getRelatedResourceAssociationSetEnd(
-				$set,
-				$type,
-				$property
-			);
-
-			//If $thisAssociationSetEnd or $relatedAssociationSetEnd
-			//is null means the associationset
-			//we got from the IDSMP::getResourceAssociationSet is invalid.
-			//AssociationSet::getResourceAssociationSetEnd
-			//return null, if AssociationSet's End1 or End2's resourceset name
-			//is not matching with the name of
-			//resource set wrapper (param1) and resource type is not assignable
-			//from given resource type (param2)
-			if (is_null($thisAssociationSetEnd) || is_null($relatedAssociationSetEnd)) {
-				throw new ODataException(
-					Messages::providersWrapperIDSMPGetResourceSetReturnsInvalidResourceSet(
-						$set->getName(),
-						$type->getFullName(),
-						$property->getName()
-					),
-					500
-				);
-			}
-
-			$relatedResourceSetWrapper = $this->_validateResourceSetAndGetWrapper(
-				$relatedAssociationSetEnd->getResourceSet()
-			);
-			if ($relatedResourceSetWrapper === null) {
-				$associationSet = null;
-			} else {
-				$this->_validateResourceType($thisAssociationSetEnd->getResourceType());
-				$this->_validateResourceType($relatedAssociationSetEnd->getResourceType());
-			}
-		}
-
-		$this->associationSetCache[$cacheKey] = $associationSet;
-		return $associationSet;
-	}
-
-	/**
-	 * Gets the target resource set wrapper for the given navigation property,
-	 * source resource set wrapper and the source resource type
-	 *
-	 * @param ResourceSetWrapper $resourceSetWrapper         Source resource set.
-	 * @param ResourceType       $resourceType               Source resource type.
-	 * @param ResourceProperty   $navigationResourceProperty Navigation property.
-	 *
-	 * @return ResourceSetWrapper|null Returns instance of ResourceSetWrapper
-	 *     (describes the entity set and associated configuration) for the
-	 *     given navigation property. returns NULL if resourceset for the
-	 *     navigation property is invisible or if metadata provider returns
-	 *     null resource association set
-	 */
-	public function getResourceSetWrapperForNavigationProperty(
-		ResourceSetWrapper $resourceSetWrapper,
-		ResourceType $resourceType,
-		ResourceProperty $navigationResourceProperty
-	) {
-		$associationSet = $this->getResourceAssociationSet(
-			$resourceSetWrapper,
-			$resourceType,
-			$navigationResourceProperty
-		);
-
-		if (!is_null($associationSet)) {
-			$relatedAssociationSetEnd = $associationSet->getRelatedResourceAssociationSetEnd(
-				$resourceSetWrapper->getResourceSet(),
-				$resourceType,
-				$navigationResourceProperty
-			);
-			return $this->_validateResourceSetAndGetWrapper(
-				$relatedAssociationSetEnd->getResourceSet()
-			);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the visible resource properties for the given resource type from the given resource set wrapper.
-	 *
-	 * @param ResourceSetWrapper $setWrapper Resource set wrapper in question.
-	 * @param ResourceType       $resourceType       Resource type in question.
-	 * @return ResourceProperty[] Collection of visible resource properties from the given resource set wrapper and resource type.
-	 */
-	public function getResourceProperties(ResourceSetWrapper $setWrapper, ResourceType $resourceType) {
-		if ($resourceType->getResourceTypeKind() != ResourceTypeKind::ENTITY) {
-			//Complex resource type
-			return $resourceType->getAllProperties();
-		}
-		//TODO: move this to doctrine annotations
-		$cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName();
-		if (!array_key_exists($cacheKey, $this->propertyCache)) {
-			//Fill the cache
-			$this->propertyCache[$cacheKey] = array();
-			foreach ($resourceType->getAllProperties() as $resourceProperty) {
-				//Check whether this is a visible navigation property
-				//TODO: is this broken?? see #87
-				if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY
-					&& !is_null($this->getResourceSetWrapperForNavigationProperty($setWrapper, $resourceType, $resourceProperty))
-				) {
-					$this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
-				} else {
-					//primitive, bag or complex property
-					$this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
-				}
-			}
-		}
-		return $this->propertyCache[$cacheKey];
-
-	}
-
-	/**
-	 * Wrapper function over _validateResourceSetAndGetWrapper function
-	 *
-	 * @param ResourceSet $resourceSet see the comments of _validateResourceSetAndGetWrapper
-	 *
-	 * @return ResourceSetWrapper|null see the comments of _validateResourceSetAndGetWrapper
-	 */
-	public function validateResourceSetAndGetWrapper(ResourceSet $resourceSet)
-	{
-		return $this->_validateResourceSetAndGetWrapper($resourceSet);
-	}
-
-	/**
-	 * Gets the Edm Schema version compliance to the metadata
-	 *
-	 * @return EdmSchemaVersion
-	 */
-	public function getEdmSchemaVersion()
-	{
-		//The minimal schema version for custom provider is 1.1
-		return EdmSchemaVersion::VERSION_1_DOT_1;
-	}
-
-	/**
-	 * This function perform the following operations
-	 *  (1) If the cache contain an entry [key, value] for the resourceset then
-	 *      return the entry-value
-	 *  (2) If the cache not contain an entry for the resourceset then validate
-	 *      the resourceset
-	 *            (a) If valid add entry as [resouceset_name, resourceSetWrapper]
-	 *            (b) if not valid add entry as [resouceset_name, null]
-	 *  Note: validating a resourceset means checking the resourceset is visible
-	 *  or not using configuration
-	 *
-	 * @param ResourceSet $resourceSet The resourceset to validate and get the
-	 *                                 wrapper for
-	 *
-	 * @return ResourceSetWrapper|null Returns an instance if a resource set with the given name is visible
-	 */
-	private function _validateResourceSetAndGetWrapper(ResourceSet $resourceSet)
-	{
-		$cacheKey = $resourceSet->getName();
-		if (array_key_exists($cacheKey, $this->setWrapperCache)) {
-			return $this->setWrapperCache[$cacheKey];
-		}
-
-		$this->_validateResourceType($resourceSet->getResourceType());
-		$wrapper = new ResourceSetWrapper($resourceSet, $this->config);
-		if ($wrapper->isVisible()) {
-			$this->setWrapperCache[$cacheKey] = $wrapper;
-		} else {
-			$this->setWrapperCache[$cacheKey] = null;
-		}
-
-		return $this->setWrapperCache[$cacheKey];
-	}
-
-	/**
-	 * Validates the given instance of ResourceType
-	 *
-	 * @param ResourceType $resourceType The ResourceType to validate
-	 *
-	 * @return ResourceType
-	 *
-	 * @throws ODataException Exception if $resourceType is invalid
-	 */
-	private function _validateResourceType(ResourceType $resourceType)
-	{
-		$cacheKey = $resourceType->getName();
-		if (array_key_exists($cacheKey, $this->typeCache)) {
-			return $this->typeCache[$cacheKey];
-		}
-
-		//TODO: Do validation if any for the ResourceType
-		$this->typeCache[$cacheKey] = $resourceType;
-		return $resourceType;
-	}
-
-	/**
-	 * Gets the resource type on which the resource property is declared on,
-	 * If property is not declared in the given resource type, then this
-	 * function drill down to the inheritance hierarchy of the given resource
-	 * type to find out the base class in which the property is declared
-	 *
-	 * @param ResourceType     $resourceType     The resource type to start looking
-	 * @param ResourceProperty $resourceProperty The resource property in question
-	 *
-	 * @return ResourceType|null Returns reference to the ResourceType on which
-	 *                                   the $resourceProperty is declared, NULL if
-	 *                                   $resourceProperty is not declared anywhere
-	 *                                   in the inheritance hierarchy
-	 */
-	private function _getResourceTypeWherePropertyIsDeclared(ResourceType $resourceType,
-		ResourceProperty $resourceProperty
-	) {
-		$type = $resourceType;
-		while ($type !== null) {
-			if ($type->resolvePropertyDeclaredOnThisType($resourceProperty->getName()) !== null) {
-				break;
-			}
-
-			$type = $type->getBaseType();
-		}
-
-		return $type;
-	}
-
-	/**
-	 * Gets the underlying custom expression provider, the end developer is
-	 * responsible for implementing IExpressionProvider if he choose for
-	 *
-	 * @return IExpressionProvider Instance of IExpressionProvider implementation.
-	 *
-	 */
-	public function getExpressionProvider()
-	{
-		$expressionProvider = $this->queryProvider->getExpressionProvider();
-		if (is_null($expressionProvider)) {
-			throw ODataException::createInternalServerError(Messages::providersWrapperExpressionProviderMustNotBeNullOrEmpty());
-		}
-
-		if (!$expressionProvider instanceof IExpressionProvider)
-		{
-			throw ODataException::createInternalServerError(Messages::providersWrapperInvalidExpressionProviderInstance());
-		}
-
-		return $expressionProvider;
-	}
-
-	/**
-	 * Indicates if the QueryProvider can handle ordered paging, this means respecting order, skip, and top parameters
-	 * If the query provider can not handle ordered paging, it must return the entire result set and POData will
-	 * perform the ordering and paging
-	 *
-	 * @return Boolean True if the query provider can handle ordered paging, false if POData should perform the paging
-	 */
-	public function handlesOrderedPaging()
-	{
-		return $this->queryProvider->handlesOrderedPaging();
-	}
-
-
-	/**
-	 * @param QueryResult $queryResult
-	 * @param string $methodName
-	 */
-	private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
-		if (!$queryResult instanceof QueryResult) {
-			throw ODataException::createInternalServerError(
-				Messages::queryProviderReturnsNonQueryResult($methodName)
-			);
-		}
-
-		if($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()){
-			//and the provider is supposed to handle the ordered paging they must return a count!
-			if($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)){
-				throw ODataException::createInternalServerError(
-					Messages::queryProviderResultCountMissing($methodName, $queryType)
-				);
-			}
-
-			//If POData is supposed to handle the ordered aging they must return results! (possibly empty)
-			if(!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)){
-				throw ODataException::createInternalServerError(
-					Messages::queryProviderResultsMissing($methodName, $queryType)
-				);
-			}
-		}
-
-		if(($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)){
-			throw ODataException::createInternalServerError(
-				Messages::queryProviderResultsMissing($methodName, $queryType)
-			);
-		}
-	}
-
-	/**
-	 * Gets collection of entities belongs to an entity set
-	 *
-	 * @param QueryType $queryType indicates if this is a query for a count, entities, or entities with a count
-	 * @param ResourceSet $resourceSet The entity set containing the entities that need to be fetched
-	 * @param FilterInfo $filterInfo represents the $filter parameter of the OData query.  NULL if no $filter specified
-	 * @param InternalOrderByInfo $orderBy The orderBy information
-	 * @param int $top The top count
-	 * @param int $skip The skip count
-	 * @param \POData\UriProcessor\QueryProcessor\SkipTokenParser\SkipTokenInfo $skiptoken
-	 * @param \POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ExpandedProjectionNode[] $expansion
-	 *
-	 * @return QueryResult
-	 */
-	public function getResourceSet(QueryType $queryType, ResourceSet $resourceSet, $filterInfo, $orderBy, $top, $skip, $skiptoken = null, $expansion = null)
-	{
-
-		$queryResult = $this->queryProvider->getResourceSet(
-			$queryType,
-			$resourceSet,
-			$filterInfo,
-			$orderBy,
-			$top,
-			$skip,
-			$skiptoken,
-			$expansion
-		);
-
-		$this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getResourceSet');
-
-		return $queryResult;
-	}
-
-
-
-	/**
-	 * Gets an entity instance from an entity set identified by a key
-	 *
-	 * @param ResourceSet $resourceSet The entity set containing the entity to fetch
-	 * @param KeyDescriptor $keyDescriptor The key identifying the entity to fetch
-	 *
-	 * @return object|null Returns entity instance if found else null
-	 */
-	public function getResourceFromResourceSet(ResourceSet $resourceSet, KeyDescriptor $keyDescriptor)
-	{
-		$entityInstance = $this->queryProvider->getResourceFromResourceSet($resourceSet, $keyDescriptor);
-		$this->_validateEntityInstance(
-			$entityInstance,
-			$resourceSet,
-			$keyDescriptor,
-			'IQueryProvider::getResourceFromResourceSet'
-		);
-		return $entityInstance;
-	}
-
-	/**
-	 * Puts an entity instance to entity set identified by a key
-	 *
-	 * @param ResourceSet $resourceSet The entity set containing the entity to update
-	 * @param KeyDescriptor $keyDescriptor The key identifying the entity to update
-	 *
-	 * @return bool|null Returns result of executiong query
-	 */
-	public function putResource(
-		ResourceSet $resourceSet,
-		KeyDescriptor $keyDescriptor,
-		$data
-	) {
-		$queryResult = $this->queryProvider->putResource(
-			$resourceSet,
-			$keyDescriptor,
-			$data
-		);
-
-		return $queryResult;
-	}
-
-	/**
-	 * Posts an entity instance to entity set identified by a key
-	 *
-	 * @param ResourceSet $resourceSet The entity set containing the entity to update
-	 *
-	 * @return bool|null Returns result of executiong query
-	 */
-	public function postResource(
-		ResourceSet $resourceSet,
-		$data
-	) {
-		$queryResult = $this->queryProvider->postResource(
-			$resourceSet,
-			$data
-		);
-
-		return $queryResult;
-	}
-
-	/**
-	 * Posts an entity instance to entity set identified by a key
-	 *
-	 * @param ResourceSet $resourceSet The entity set containing the entity to update
-	 * @param KeyDescriptor $keyDescriptor The key identifying the entity to update
-	 *
-	 * @return bool|null Returns result of executiong query
-	 */
-	public function deleteResource(
-		ResourceSet $resourceSet,
-		$keyDescriptor
-	) {
-		$queryResult = $this->queryProvider->deleteResource(
-			$resourceSet,
-			$keyDescriptor
-		);
-
-		return $queryResult;
-	}
-
-	/**
-	 * Get related resource set for a resource
-	 *
-	 * @param QueryType $queryType indicates if this is a query for a count, entities, or entities with a count
-	 * @param ResourceSet $sourceResourceSet The entity set containing the source entity
-	 * @param object $sourceEntity The source entity instance.
-	 * @param ResourceSet      $targetResourceSet    The resource set of containing the target of the navigation property
-	 * @param ResourceProperty $targetProperty       The navigation property to retrieve
-	 * @param FilterInfo  $filterInfo represents the $filter parameter of the OData query.  NULL if no $filter specified
-	 * @param mixed $orderBy sorted order if we want to get the data in some specific order
-	 * @param int $top number of records which  need to be skip
-	 * @param String $skip value indicating what records to skip
-	 *
-	 * @return QueryResult
-	 *
-	 * @throws ODataException
-	 */
-	public function getRelatedResourceSet(
-		QueryType $queryType,
-		ResourceSet $sourceResourceSet,
-		$sourceEntity,
-		ResourceSet $targetResourceSet,
-		ResourceProperty $targetProperty,
-		$filterInfo,
-		$orderBy,
-		$top,
-		$skip
-	) {
-
-		$queryResult = $this->queryProvider->getRelatedResourceSet(
-			$queryType,
-			$sourceResourceSet,
-			$sourceEntity,
-			$targetResourceSet,
-			$targetProperty,
-			$filterInfo,
-			$orderBy,
-			$top,
-			$skip
-		);
-
-
-		$this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getRelatedResourceSet');
-
-
-		return $queryResult;
-	}
-
-	/**
-	 * Gets a related entity instance from an entity set identified by a key
-	 *
-	 * @param ResourceSet      $sourceResourceSet The entity set related to the entity to be fetched.
-	 * @param object           $sourceEntity      The related entity instance.
-	 * @param ResourceSet      $targetResourceSet The entity set from which entity needs to be fetched.
-	 * @param ResourceProperty $targetProperty    The metadata of the target property.
-	 * @param KeyDescriptor    $keyDescriptor     The key to identify the entity to be fetched.
-	 *
-	 *
-	 * @return object|null Returns entity instance if found else null
-	 */
-	public function getResourceFromRelatedResourceSet(ResourceSet $sourceResourceSet,
-		$sourceEntity, ResourceSet $targetResourceSet, ResourceProperty $targetProperty,
-		KeyDescriptor $keyDescriptor
-	) {
-		$entityInstance = $this->queryProvider->getResourceFromRelatedResourceSet(
-			$sourceResourceSet,
-			$sourceEntity,
-			$targetResourceSet,
-			$targetProperty,
-			$keyDescriptor
-		);
-
-		$this->_validateEntityInstance(
-			$entityInstance, $targetResourceSet,
-			$keyDescriptor,
-			'IQueryProvider::getResourceFromRelatedResourceSet'
-		);
-		return $entityInstance;
-	}
-
-	/**
-	 * Get related resource for a resource
-	 *
-	 * @param ResourceSet      $sourceResourceSet The source resource set
-	 * @param object           $sourceEntity      The source resource
-	 * @param ResourceSet      $targetResourceSet The resource set of the navigation
-	 *                                            property
-	 * @param ResourceProperty $targetProperty    The navigation property to be
-	 *                                            retrieved
-	 *
-	 * @return object|null The related resource if exists else null
-	 */
-	public function getRelatedResourceReference(ResourceSet $sourceResourceSet,
-		$sourceEntity, ResourceSet $targetResourceSet,
-		ResourceProperty $targetProperty
-	) {
-		$entityInstance = $this->queryProvider->getRelatedResourceReference(
-			$sourceResourceSet,
-			$sourceEntity,
-			$targetResourceSet,
-			$targetProperty
-		);
-
-		// we will not throw error if the resource reference is null
-		// e.g. Orders(1234)/Customer => Customer can be null, this is
-		// allowed if Customer is last segment. consider the following:
-		// Orders(1234)/Customer/Orders => here if Customer is null then
-		// the UriProcessor will throw error.
-		if (!is_null($entityInstance)) {
-			$entityName
-				= $targetResourceSet
-					->getResourceType()
-					->getInstanceType()
-					->getName();
-			if (!is_object($entityInstance)
-				|| !($entityInstance instanceof $entityName)
-			) {
-				throw ODataException::createInternalServerError(
-					Messages::providersWrapperIDSQPMethodReturnsUnExpectedType(
-						$entityName,
-						'IQueryProvider::getRelatedResourceReference'
-					)
-				);
-			}
-
-			foreach ($targetProperty->getResourceType()->getKeyProperties()
-			as $keyName => $resourceProperty) {
-				try {
-					$keyProperty = new \ReflectionProperty(
-						$entityInstance,
-						$keyName
-					);
-					$keyProperty->setAccessible(true);
-					$keyValue = $keyProperty->getValue($entityInstance);
-					if (is_null($keyValue)) {
-						throw ODataException::createInternalServerError(
-							Messages::providersWrapperIDSQPMethodReturnsInstanceWithNullKeyProperties('IDSQP::getRelatedResourceReference')
-						);
-					}
-				} catch (\ReflectionException $reflectionException) {
-					//throw ODataException::createInternalServerError(
-					//    Messages::orderByParserFailedToAccessOrInitializeProperty(
-					//        $resourceProperty->getName(), $resourceType->getName()
-					//    )
-					//);
-				}
-			}
-		}
-
-		return $entityInstance;
-	}
-
-	/**
-	 * Validate the given entity instance.
-	 *
-	 * @param object        $entityInstance Entity instance to validate
-	 * @param ResourceSet   &$resourceSet   Resource set to which the entity
-	 *                                      instance belongs to.
-	 * @param KeyDescriptor &$keyDescriptor The key descriptor.
-	 * @param string        $methodName     Method from which this function
-	 *                                      invoked.
-	 *
-	 * @return void
-	 *
-	 * @throws ODataException
-	 */
-	private function _validateEntityInstance($entityInstance,
-		ResourceSet &$resourceSet,
-		KeyDescriptor &$keyDescriptor,
-		$methodName
-	) {
-		if (is_null($entityInstance)) {
-			throw ODataException::createResourceNotFoundError($resourceSet->getName());
-		}
-
-		$entityName = $resourceSet->getResourceType()->getInstanceType()->getName();
-		if (!is_object($entityInstance)
-			|| !($entityInstance instanceof $entityName)
-		) {
-			throw ODataException::createInternalServerError(
-				Messages::providersWrapperIDSQPMethodReturnsUnExpectedType(
-					$entityName,
-					$methodName
-				)
-			);
-		}
-
-		foreach ($keyDescriptor->getValidatedNamedValues()
-			as $keyName => $valueDescription) {
-			try {
-				$keyProperty = new \ReflectionProperty($entityInstance, $keyName);
-				$keyProperty->setAccessible(true);
-				$keyValue = $keyProperty->getValue($entityInstance);
-				if (is_null($keyValue)) {
-					throw ODataException::createInternalServerError(
-						Messages::providersWrapperIDSQPMethodReturnsInstanceWithNullKeyProperties($methodName)
-					);
-				}
-
-				$convertedValue
-					= $valueDescription[1]->convert($valueDescription[0]);
-				if ($keyValue != $convertedValue) {
-					throw ODataException::createInternalServerError(
-						Messages::providersWrapperIDSQPMethodReturnsInstanceWithNonMatchingKeys($methodName)
-					);
-				}
-			} catch (\ReflectionException $reflectionException) {
-				//throw ODataException::createInternalServerError(
-				//  Messages::orderByParserFailedToAccessOrInitializeProperty(
-				//      $resourceProperty->getName(), $resourceType->getName()
-				//  )
-				//);
-			}
-		}
-	}
-
-	/**
-	 * Assert that the given condition is true.
-	 *
-	 * @param boolean $condition         Condition to be asserted.
-	 * @param string  $conditionAsString String containing message incase
-	 *                                   if assertion fails.
-	 *
-	 * @throws InvalidOperationException Incase if assertion fails.
-	 *
-	 * @return void
-	 */
-	protected function assert($condition, $conditionAsString)
-	{
-		if (!$condition) {
-			throw new InvalidOperationException("Unexpected state, expecting $conditionAsString");
-		}
-	}
+    /**
+     * Holds reference to IMetadataProvider implementation
+     *
+     * @var IMetadataProvider
+     */
+    private $metaProvider;
+
+    /**
+     * Holds reference to IQueryProvider implementation
+     *
+     * @var IQueryProvider
+     *
+     */
+    private $queryProvider;
+
+    /**
+     * Holds reference to IServiceConfiguration implementation
+     *
+     * @var ServiceConfiguration
+     */
+    private $config;
+
+
+    /**
+     * Cache for ResourceProperties of a resource type that belongs to a
+     * resource set. An entry (ResourceProperty collection) in this cache
+     * contains only the visible properties of ResourceType.
+     *
+     * @var array(string, array(string, ResourceProperty))
+     */
+    private $propertyCache;
+
+    /**
+     * Cache for ResourceSetWrappers. If ResourceSet is invisible value will
+     * be null.
+     *
+     * @var ResourceSetWrapper[] indexed by resource set name
+     */
+    private $setWrapperCache;
+
+    /**
+     * Cache for ResourceTypes
+     *
+     * @var ResourceType[] indexed by resource type name
+     */
+    private $typeCache;
+
+    /**
+     * Cache for ResourceAssociationSet. If ResourceAssociationSet is invisible
+     * value will be null.
+     *
+     * @var ResourceAssociationSet[] indexed by name
+     */
+    private $associationSetCache;
+
+    /**
+     * Creates a new instance of ProvidersWrapper
+     *
+     * @param IMetadataProvider $metadataProvider Reference to IMetadataProvider implementation
+     * @param IQueryProvider    $queryProvider    Reference to IQueryProvider implementation
+     * @param ServiceConfiguration    $configuration    Reference to IServiceConfiguration implementation
+     */
+    public function __construct(IMetadataProvider $metadataProvider, IQueryProvider $queryProvider, ServiceConfiguration $configuration)
+    {
+        $this->metaProvider = $metadataProvider;
+        $this->queryProvider = $queryProvider;
+        $this->config = $configuration;
+        $this->setWrapperCache = array();
+        $this->typeCache = array();
+        $this->associationSetCache = array();
+        $this->propertyCache = array();
+    }
+
+    //Wrappers for IMetadataProvider methods
+
+    /**
+     * To get the Container name for the data source,
+     * Note: Wrapper for IMetadataProvider::getContainerName method
+     * implementation
+     *
+     * @return string that contains the name of the container
+     *
+     * @throws ODataException Exception if implementation returns empty container name
+     *
+     */
+    public function getContainerName()
+    {
+        $containerName = $this->metaProvider->getContainerName();
+        if (empty($containerName)) {
+            throw new ODataException(
+                Messages::providersWrapperContainerNameMustNotBeNullOrEmpty(),
+                500
+            );
+        }
+
+        return $containerName;
+    }
+
+    /**
+     * To get Namespace name for the data source,
+     * Note: Wrapper for IMetadataProvider::getContainerNamespace method implementation
+     *
+     * @return string that contains the namespace name.
+     *
+     * @throws ODataException Exception if implementation returns empty container namespace
+     *
+     */
+    public function getContainerNamespace()
+    {
+        $containerNamespace = $this->metaProvider->getContainerNamespace();
+        if (empty($containerNamespace)) {
+            throw new ODataException(
+                Messages::providersWrapperContainerNamespaceMustNotBeNullOrEmpty(),
+                500
+            );
+        }
+
+        return $containerNamespace;
+    }
+
+    /**
+     * To get the data service configuration
+     *
+     * @return ServiceConfiguration
+     */
+    public function getConfiguration()
+    {
+        return $this->config;
+    }
+
+    /**
+     *  To get all entity set information,
+     *  Note: Wrapper for IMetadataProvider::getResourceSets method implementation,
+     *  This method returns array of ResourceSetWrapper instances but the corresponding IDSMP method returns array of ResourceSet instances
+     *
+     *  @return ResourceSetWrapper[] The ResourceSetWrappers for the visible ResourceSets
+     *  @throws ODataException when two resource sets with the same name are encountered
+     *
+     */
+    public function getResourceSets()
+    {
+        $resourceSets = $this->metaProvider->getResourceSets();
+        $resourceSetWrappers = array();
+        $resourceSetNames = array();
+        foreach ($resourceSets as $resourceSet) {
+            $name = $resourceSet->getName();
+            if (in_array($name, $resourceSetNames)) {
+                throw new ODataException(Messages::providersWrapperEntitySetNameShouldBeUnique($name), 500);
+            }
+
+            $resourceSetNames[] = $name;
+            $resourceSetWrapper = $this->_validateResourceSetAndGetWrapper($resourceSet);
+            if (!is_null($resourceSetWrapper)) {
+                $resourceSetWrappers[] = $resourceSetWrapper;
+            }
+        }
+
+        return $resourceSetWrappers;
+    }
+
+    /**
+     * To get all resource types in the data source,
+     * Note: Wrapper for IMetadataProvider::getTypes method implementation
+     *
+     * @return ResourceType[]
+     */
+    public function getTypes()
+    {
+        $resourceTypes = $this->metaProvider->getTypes();
+        $resourceTypeNames = array();
+        foreach ($resourceTypes as $resourceType) {
+            if (in_array($resourceType->getName(), $resourceTypeNames)) {
+                throw new ODataException(
+                    Messages::providersWrapperEntityTypeNameShouldBeUnique($resourceType->getName()),
+                    500
+                );
+            }
+
+            $resourceTypeNames[] = $resourceType->getName();
+            $this->_validateResourceType($resourceType);
+        }
+
+        return $resourceTypes;
+    }
+
+    /**
+     * To get a resource set based on the specified resource set name which is
+     * visible,
+     * Note: Wrapper for IMetadataProvider::resolveResourceSet method
+     * implementation
+     *
+     * @param string $name Name of the resource set
+     *
+     * @return ResourceSetWrapper|null Returns resource set with the given name if found, NULL if resource set is set to invisible or not found
+     *
+     */
+    public function resolveResourceSet($name)
+    {
+        if (array_key_exists($name, $this->setWrapperCache)) {
+            return $this->setWrapperCache[$name];
+        }
+
+        $resourceSet = $this->metaProvider->resolveResourceSet($name);
+        if (is_null($resourceSet)) {
+            return null;
+        }
+
+        return $this->_validateResourceSetAndGetWrapper($resourceSet);
+    }
+
+    /**
+     * To get a resource type based on the resource set name,
+     * Note: Wrapper for IMetadataProvider::resolveResourceType
+     * method implementation
+     *
+     * @param string $name Name of the resource set
+     *
+     * @return ResourceType|null resource type with the given resource set name if found else NULL
+     *
+     *
+     * @throws ODataException If the ResourceType is invalid
+     */
+    public function resolveResourceType($name)
+    {
+        $resourceType = $this->metaProvider->resolveResourceType($name);
+        if (is_null($resourceType)) {
+            return null;
+        }
+
+        return $this->_validateResourceType($resourceType);
+    }
+
+    /**
+     * The method must return a collection of all the types derived from
+     * $resourceType The collection returned should NOT include the type
+     * passed in as a parameter
+     * Note: Wrapper for IMetadataProvider::getDerivedTypes
+     * method implementation
+     *
+     * @param ResourceType $resourceType Resource to get derived resource types from
+     *
+     * @return ResourceType[]
+     *
+     * @throws InvalidOperationException when the meat provider doesn't return an array
+     */
+    public function getDerivedTypes(ResourceType $resourceType)
+    {
+        $derivedTypes = $this->metaProvider->getDerivedTypes($resourceType);
+        if (!is_array($derivedTypes)) {
+            throw new InvalidOperationException(Messages::metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceType->getName()));
+        }
+
+        foreach ($derivedTypes as $derivedType) {
+            $this->_validateResourceType($derivedType);
+        }
+
+        return $derivedTypes;
+    }
+
+    /**
+     * Returns true if $resourceType represents an Entity Type which has derived
+     * Entity Types, else false.
+     * Note: Wrapper for IMetadataProvider::hasDerivedTypes method
+     * implementation
+     *
+     * @param ResourceType $resourceType Resource to check for derived resource
+     *                                   types.
+     *
+     * @return boolean
+     *
+     * @throws ODataException If the ResourceType is invalid
+     */
+    public function hasDerivedTypes(ResourceType $resourceType)
+    {
+        $this->_validateResourceType($resourceType);
+        return $this->metaProvider->hasDerivedTypes($resourceType);
+    }
+
+    /**
+     * Gets the ResourceAssociationSet instance for the given source association end,
+     * Note: Wrapper for IMetadataProvider::getResourceAssociationSet
+     * method implementation
+     *
+     * @param ResourceSet $set Resource set of the source association end
+     * @param ResourceType       $type       Resource type of the source association end
+     * @param ResourceProperty   $property   Resource property of the source association end
+     *
+     *
+     * @return ResourceAssociationSet|null Returns ResourceAssociationSet for the source
+     *                                             association end, NULL if no such
+     *                                             association end or resource set in the
+     *                                             other end of the association is invisible
+     */
+    public function getResourceAssociationSet(
+        ResourceSet $set,
+        ResourceType $type,
+        ResourceProperty $property
+    ) {
+        $type = $this->_getResourceTypeWherePropertyIsDeclared($type, $property);
+        $cacheKey = $set->getName() . '_' . $type->getName() . '_' . $property->getName();
+
+        if (array_key_exists($cacheKey, $this->associationSetCache)) {
+            return $this->associationSetCache[$cacheKey];
+        }
+
+        $associationSet = $this->metaProvider->getResourceAssociationSet(
+            $set,
+            $type,
+            $property
+        );
+
+        if (!is_null($associationSet)) {
+            $thisAssociationSetEnd = $associationSet->getResourceAssociationSetEnd(
+                $set,
+                $type,
+                $property
+            );
+
+            $relatedAssociationSetEnd = $associationSet->getRelatedResourceAssociationSetEnd(
+                $set,
+                $type,
+                $property
+            );
+
+            //If $thisAssociationSetEnd or $relatedAssociationSetEnd
+            //is null means the associationset
+            //we got from the IDSMP::getResourceAssociationSet is invalid.
+            //AssociationSet::getResourceAssociationSetEnd
+            //return null, if AssociationSet's End1 or End2's resourceset name
+            //is not matching with the name of
+            //resource set wrapper (param1) and resource type is not assignable
+            //from given resource type (param2)
+            if (is_null($thisAssociationSetEnd) || is_null($relatedAssociationSetEnd)) {
+                throw new ODataException(
+                    Messages::providersWrapperIDSMPGetResourceSetReturnsInvalidResourceSet(
+                        $set->getName(),
+                        $type->getFullName(),
+                        $property->getName()
+                    ),
+                    500
+                );
+            }
+
+            $relatedResourceSetWrapper = $this->_validateResourceSetAndGetWrapper(
+                $relatedAssociationSetEnd->getResourceSet()
+            );
+            if ($relatedResourceSetWrapper === null) {
+                $associationSet = null;
+            } else {
+                $this->_validateResourceType($thisAssociationSetEnd->getResourceType());
+                $this->_validateResourceType($relatedAssociationSetEnd->getResourceType());
+            }
+        }
+
+        $this->associationSetCache[$cacheKey] = $associationSet;
+        return $associationSet;
+    }
+
+    /**
+     * Gets the target resource set wrapper for the given navigation property,
+     * source resource set wrapper and the source resource type
+     *
+     * @param ResourceSetWrapper $resourceSetWrapper         Source resource set.
+     * @param ResourceType       $resourceType               Source resource type.
+     * @param ResourceProperty   $navigationResourceProperty Navigation property.
+     *
+     * @return ResourceSetWrapper|null Returns instance of ResourceSetWrapper
+     *     (describes the entity set and associated configuration) for the
+     *     given navigation property. returns NULL if resourceset for the
+     *     navigation property is invisible or if metadata provider returns
+     *     null resource association set
+     */
+    public function getResourceSetWrapperForNavigationProperty(
+        ResourceSetWrapper $resourceSetWrapper,
+        ResourceType $resourceType,
+        ResourceProperty $navigationResourceProperty
+    ) {
+        $associationSet = $this->getResourceAssociationSet(
+            $resourceSetWrapper,
+            $resourceType,
+            $navigationResourceProperty
+        );
+
+        if (!is_null($associationSet)) {
+            $relatedAssociationSetEnd = $associationSet->getRelatedResourceAssociationSetEnd(
+                $resourceSetWrapper->getResourceSet(),
+                $resourceType,
+                $navigationResourceProperty
+            );
+            return $this->_validateResourceSetAndGetWrapper(
+                $relatedAssociationSetEnd->getResourceSet()
+            );
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the visible resource properties for the given resource type from the given resource set wrapper.
+     *
+     * @param ResourceSetWrapper $setWrapper Resource set wrapper in question.
+     * @param ResourceType       $resourceType       Resource type in question.
+     * @return ResourceProperty[] Collection of visible resource properties from the given resource set wrapper and resource type.
+     */
+    public function getResourceProperties(ResourceSetWrapper $setWrapper, ResourceType $resourceType) {
+        if ($resourceType->getResourceTypeKind() != ResourceTypeKind::ENTITY) {
+            //Complex resource type
+            return $resourceType->getAllProperties();
+        }
+        //TODO: move this to doctrine annotations
+        $cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName();
+        if (!array_key_exists($cacheKey, $this->propertyCache)) {
+            //Fill the cache
+            $this->propertyCache[$cacheKey] = array();
+            foreach ($resourceType->getAllProperties() as $resourceProperty) {
+                //Check whether this is a visible navigation property
+                //TODO: is this broken?? see #87
+                if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY
+                    && !is_null($this->getResourceSetWrapperForNavigationProperty($setWrapper, $resourceType, $resourceProperty))
+                ) {
+                    $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
+                } else {
+                    //primitive, bag or complex property
+                    $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
+                }
+            }
+        }
+        return $this->propertyCache[$cacheKey];
+
+    }
+
+    /**
+     * Wrapper function over _validateResourceSetAndGetWrapper function
+     *
+     * @param ResourceSet $resourceSet see the comments of _validateResourceSetAndGetWrapper
+     *
+     * @return ResourceSetWrapper|null see the comments of _validateResourceSetAndGetWrapper
+     */
+    public function validateResourceSetAndGetWrapper(ResourceSet $resourceSet)
+    {
+        return $this->_validateResourceSetAndGetWrapper($resourceSet);
+    }
+
+    /**
+     * Gets the Edm Schema version compliance to the metadata
+     *
+     * @return EdmSchemaVersion
+     */
+    public function getEdmSchemaVersion()
+    {
+        //The minimal schema version for custom provider is 1.1
+        return EdmSchemaVersion::VERSION_1_DOT_1;
+    }
+
+    /**
+     * This function perform the following operations
+     *  (1) If the cache contain an entry [key, value] for the resourceset then
+     *      return the entry-value
+     *  (2) If the cache not contain an entry for the resourceset then validate
+     *      the resourceset
+     *            (a) If valid add entry as [resouceset_name, resourceSetWrapper]
+     *            (b) if not valid add entry as [resouceset_name, null]
+     *  Note: validating a resourceset means checking the resourceset is visible
+     *  or not using configuration
+     *
+     * @param ResourceSet $resourceSet The resourceset to validate and get the
+     *                                 wrapper for
+     *
+     * @return ResourceSetWrapper|null Returns an instance if a resource set with the given name is visible
+     */
+    private function _validateResourceSetAndGetWrapper(ResourceSet $resourceSet)
+    {
+        $cacheKey = $resourceSet->getName();
+        if (array_key_exists($cacheKey, $this->setWrapperCache)) {
+            return $this->setWrapperCache[$cacheKey];
+        }
+
+        $this->_validateResourceType($resourceSet->getResourceType());
+        $wrapper = new ResourceSetWrapper($resourceSet, $this->config);
+        if ($wrapper->isVisible()) {
+            $this->setWrapperCache[$cacheKey] = $wrapper;
+        } else {
+            $this->setWrapperCache[$cacheKey] = null;
+        }
+
+        return $this->setWrapperCache[$cacheKey];
+    }
+
+    /**
+     * Validates the given instance of ResourceType
+     *
+     * @param ResourceType $resourceType The ResourceType to validate
+     *
+     * @return ResourceType
+     *
+     * @throws ODataException Exception if $resourceType is invalid
+     */
+    private function _validateResourceType(ResourceType $resourceType)
+    {
+        $cacheKey = $resourceType->getName();
+        if (array_key_exists($cacheKey, $this->typeCache)) {
+            return $this->typeCache[$cacheKey];
+        }
+
+        //TODO: Do validation if any for the ResourceType
+        $this->typeCache[$cacheKey] = $resourceType;
+        return $resourceType;
+    }
+
+    /**
+     * Gets the resource type on which the resource property is declared on,
+     * If property is not declared in the given resource type, then this
+     * function drill down to the inheritance hierarchy of the given resource
+     * type to find out the base class in which the property is declared
+     *
+     * @param ResourceType     $resourceType     The resource type to start looking
+     * @param ResourceProperty $resourceProperty The resource property in question
+     *
+     * @return ResourceType|null Returns reference to the ResourceType on which
+     *                                   the $resourceProperty is declared, NULL if
+     *                                   $resourceProperty is not declared anywhere
+     *                                   in the inheritance hierarchy
+     */
+    private function _getResourceTypeWherePropertyIsDeclared(ResourceType $resourceType,
+        ResourceProperty $resourceProperty
+    ) {
+        $type = $resourceType;
+        while ($type !== null) {
+            if ($type->resolvePropertyDeclaredOnThisType($resourceProperty->getName()) !== null) {
+                break;
+            }
+
+            $type = $type->getBaseType();
+        }
+
+        return $type;
+    }
+
+    /**
+     * Gets the underlying custom expression provider, the end developer is
+     * responsible for implementing IExpressionProvider if he choose for
+     *
+     * @return IExpressionProvider Instance of IExpressionProvider implementation.
+     *
+     */
+    public function getExpressionProvider()
+    {
+        $expressionProvider = $this->queryProvider->getExpressionProvider();
+        if (is_null($expressionProvider)) {
+            throw ODataException::createInternalServerError(Messages::providersWrapperExpressionProviderMustNotBeNullOrEmpty());
+        }
+
+        if (!$expressionProvider instanceof IExpressionProvider)
+        {
+            throw ODataException::createInternalServerError(Messages::providersWrapperInvalidExpressionProviderInstance());
+        }
+
+        return $expressionProvider;
+    }
+
+    /**
+     * Indicates if the QueryProvider can handle ordered paging, this means respecting order, skip, and top parameters
+     * If the query provider can not handle ordered paging, it must return the entire result set and POData will
+     * perform the ordering and paging
+     *
+     * @return Boolean True if the query provider can handle ordered paging, false if POData should perform the paging
+     */
+    public function handlesOrderedPaging()
+    {
+        return $this->queryProvider->handlesOrderedPaging();
+    }
+
+
+    /**
+     * @param QueryResult $queryResult
+     * @param string $methodName
+     */
+    private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
+        if (!$queryResult instanceof QueryResult) {
+            throw ODataException::createInternalServerError(
+                Messages::queryProviderReturnsNonQueryResult($methodName)
+            );
+        }
+
+        if($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()){
+            //and the provider is supposed to handle the ordered paging they must return a count!
+            if($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)){
+                throw ODataException::createInternalServerError(
+                    Messages::queryProviderResultCountMissing($methodName, $queryType)
+                );
+            }
+
+            //If POData is supposed to handle the ordered aging they must return results! (possibly empty)
+            if(!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)){
+                throw ODataException::createInternalServerError(
+                    Messages::queryProviderResultsMissing($methodName, $queryType)
+                );
+            }
+        }
+
+        if(($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)){
+            throw ODataException::createInternalServerError(
+                Messages::queryProviderResultsMissing($methodName, $queryType)
+            );
+        }
+    }
+
+    /**
+     * Gets collection of entities belongs to an entity set
+     *
+     * @param QueryType $queryType indicates if this is a query for a count, entities, or entities with a count
+     * @param ResourceSet $resourceSet The entity set containing the entities that need to be fetched
+     * @param FilterInfo $filterInfo represents the $filter parameter of the OData query.  NULL if no $filter specified
+     * @param InternalOrderByInfo $orderBy The orderBy information
+     * @param int $top The top count
+     * @param int $skip The skip count
+     * @param \POData\UriProcessor\QueryProcessor\SkipTokenParser\SkipTokenInfo $skiptoken
+     * @param \POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ExpandedProjectionNode[] $expansion
+     *
+     * @return QueryResult
+     */
+    public function getResourceSet(QueryType $queryType, ResourceSet $resourceSet, $filterInfo, $orderBy, $top, $skip, $skiptoken = null, $expansion = null)
+    {
+
+        $queryResult = $this->queryProvider->getResourceSet(
+            $queryType,
+            $resourceSet,
+            $filterInfo,
+            $orderBy,
+            $top,
+            $skip,
+            $skiptoken,
+            $expansion
+        );
+
+        $this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getResourceSet');
+
+        return $queryResult;
+    }
+
+
+
+    /**
+     * Gets an entity instance from an entity set identified by a key
+     *
+     * @param ResourceSet $resourceSet The entity set containing the entity to fetch
+     * @param KeyDescriptor $keyDescriptor The key identifying the entity to fetch
+     *
+     * @return object|null Returns entity instance if found else null
+     */
+    public function getResourceFromResourceSet(ResourceSet $resourceSet, KeyDescriptor $keyDescriptor)
+    {
+        $entityInstance = $this->queryProvider->getResourceFromResourceSet($resourceSet, $keyDescriptor);
+        $this->_validateEntityInstance(
+            $entityInstance,
+            $resourceSet,
+            $keyDescriptor,
+            'IQueryProvider::getResourceFromResourceSet'
+        );
+        return $entityInstance;
+    }
+
+    /**
+     * Puts an entity instance to entity set identified by a key
+     *
+     * @param ResourceSet $resourceSet The entity set containing the entity to update
+     * @param KeyDescriptor $keyDescriptor The key identifying the entity to update
+     *
+     * @return bool|null Returns result of executiong query
+     */
+    public function putResource(
+        ResourceSet $resourceSet,
+        KeyDescriptor $keyDescriptor,
+        $data
+    ) {
+        $queryResult = $this->queryProvider->putResource(
+            $resourceSet,
+            $keyDescriptor,
+            $data
+        );
+
+        return $queryResult;
+    }
+
+    /**
+     * Posts an entity instance to entity set identified by a key
+     *
+     * @param ResourceSet $resourceSet The entity set containing the entity to update
+     *
+     * @return bool|null Returns result of executiong query
+     */
+    public function postResource(
+        ResourceSet $resourceSet,
+        $data
+    ) {
+        $queryResult = $this->queryProvider->postResource(
+            $resourceSet,
+            $data
+        );
+
+        return $queryResult;
+    }
+
+    /**
+     * Posts an entity instance to entity set identified by a key
+     *
+     * @param ResourceSet $resourceSet The entity set containing the entity to update
+     * @param KeyDescriptor $keyDescriptor The key identifying the entity to update
+     *
+     * @return bool|null Returns result of executiong query
+     */
+    public function deleteResource(
+        ResourceSet $resourceSet,
+        $keyDescriptor
+    ) {
+        $queryResult = $this->queryProvider->deleteResource(
+            $resourceSet,
+            $keyDescriptor
+        );
+
+        return $queryResult;
+    }
+
+    /**
+     * Get related resource set for a resource
+     *
+     * @param QueryType $queryType indicates if this is a query for a count, entities, or entities with a count
+     * @param ResourceSet $sourceResourceSet The entity set containing the source entity
+     * @param object $sourceEntity The source entity instance.
+     * @param ResourceSet      $targetResourceSet    The resource set of containing the target of the navigation property
+     * @param ResourceProperty $targetProperty       The navigation property to retrieve
+     * @param FilterInfo  $filterInfo represents the $filter parameter of the OData query.  NULL if no $filter specified
+     * @param mixed $orderBy sorted order if we want to get the data in some specific order
+     * @param int $top number of records which  need to be skip
+     * @param String $skip value indicating what records to skip
+     *
+     * @return QueryResult
+     *
+     * @throws ODataException
+     */
+    public function getRelatedResourceSet(
+        QueryType $queryType,
+        ResourceSet $sourceResourceSet,
+        $sourceEntity,
+        ResourceSet $targetResourceSet,
+        ResourceProperty $targetProperty,
+        $filterInfo,
+        $orderBy,
+        $top,
+        $skip
+    ) {
+
+        $queryResult = $this->queryProvider->getRelatedResourceSet(
+            $queryType,
+            $sourceResourceSet,
+            $sourceEntity,
+            $targetResourceSet,
+            $targetProperty,
+            $filterInfo,
+            $orderBy,
+            $top,
+            $skip
+        );
+
+
+        $this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getRelatedResourceSet');
+
+
+        return $queryResult;
+    }
+
+    /**
+     * Gets a related entity instance from an entity set identified by a key
+     *
+     * @param ResourceSet      $sourceResourceSet The entity set related to the entity to be fetched.
+     * @param object           $sourceEntity      The related entity instance.
+     * @param ResourceSet      $targetResourceSet The entity set from which entity needs to be fetched.
+     * @param ResourceProperty $targetProperty    The metadata of the target property.
+     * @param KeyDescriptor    $keyDescriptor     The key to identify the entity to be fetched.
+     *
+     *
+     * @return object|null Returns entity instance if found else null
+     */
+    public function getResourceFromRelatedResourceSet(ResourceSet $sourceResourceSet,
+        $sourceEntity, ResourceSet $targetResourceSet, ResourceProperty $targetProperty,
+        KeyDescriptor $keyDescriptor
+    ) {
+        $entityInstance = $this->queryProvider->getResourceFromRelatedResourceSet(
+            $sourceResourceSet,
+            $sourceEntity,
+            $targetResourceSet,
+            $targetProperty,
+            $keyDescriptor
+        );
+
+        $this->_validateEntityInstance(
+            $entityInstance, $targetResourceSet,
+            $keyDescriptor,
+            'IQueryProvider::getResourceFromRelatedResourceSet'
+        );
+        return $entityInstance;
+    }
+
+    /**
+     * Get related resource for a resource
+     *
+     * @param ResourceSet      $sourceResourceSet The source resource set
+     * @param object           $sourceEntity      The source resource
+     * @param ResourceSet      $targetResourceSet The resource set of the navigation
+     *                                            property
+     * @param ResourceProperty $targetProperty    The navigation property to be
+     *                                            retrieved
+     *
+     * @return object|null The related resource if exists else null
+     */
+    public function getRelatedResourceReference(ResourceSet $sourceResourceSet,
+        $sourceEntity, ResourceSet $targetResourceSet,
+        ResourceProperty $targetProperty
+    ) {
+        $entityInstance = $this->queryProvider->getRelatedResourceReference(
+            $sourceResourceSet,
+            $sourceEntity,
+            $targetResourceSet,
+            $targetProperty
+        );
+
+        // we will not throw error if the resource reference is null
+        // e.g. Orders(1234)/Customer => Customer can be null, this is
+        // allowed if Customer is last segment. consider the following:
+        // Orders(1234)/Customer/Orders => here if Customer is null then
+        // the UriProcessor will throw error.
+        if (!is_null($entityInstance)) {
+            $entityName
+                = $targetResourceSet
+                    ->getResourceType()
+                    ->getInstanceType()
+                    ->getName();
+            if (!is_object($entityInstance)
+                || !($entityInstance instanceof $entityName)
+            ) {
+                throw ODataException::createInternalServerError(
+                    Messages::providersWrapperIDSQPMethodReturnsUnExpectedType(
+                        $entityName,
+                        'IQueryProvider::getRelatedResourceReference'
+                    )
+                );
+            }
+
+            foreach ($targetProperty->getResourceType()->getKeyProperties()
+            as $keyName => $resourceProperty) {
+                try {
+                    $keyProperty = new \ReflectionProperty(
+                        $entityInstance,
+                        $keyName
+                    );
+                    $keyProperty->setAccessible(true);
+                    $keyValue = $keyProperty->getValue($entityInstance);
+                    if (is_null($keyValue)) {
+                        throw ODataException::createInternalServerError(
+                            Messages::providersWrapperIDSQPMethodReturnsInstanceWithNullKeyProperties('IDSQP::getRelatedResourceReference')
+                        );
+                    }
+                } catch (\ReflectionException $reflectionException) {
+                    //throw ODataException::createInternalServerError(
+                    //    Messages::orderByParserFailedToAccessOrInitializeProperty(
+                    //        $resourceProperty->getName(), $resourceType->getName()
+                    //    )
+                    //);
+                }
+            }
+        }
+
+        return $entityInstance;
+    }
+
+    /**
+     * Validate the given entity instance.
+     *
+     * @param object        $entityInstance Entity instance to validate
+     * @param ResourceSet   &$resourceSet   Resource set to which the entity
+     *                                      instance belongs to.
+     * @param KeyDescriptor &$keyDescriptor The key descriptor.
+     * @param string        $methodName     Method from which this function
+     *                                      invoked.
+     *
+     * @return void
+     *
+     * @throws ODataException
+     */
+    private function _validateEntityInstance($entityInstance,
+        ResourceSet &$resourceSet,
+        KeyDescriptor &$keyDescriptor,
+        $methodName
+    ) {
+        if (is_null($entityInstance)) {
+            throw ODataException::createResourceNotFoundError($resourceSet->getName());
+        }
+
+        $entityName = $resourceSet->getResourceType()->getInstanceType()->getName();
+        if (!is_object($entityInstance)
+            || !($entityInstance instanceof $entityName)
+        ) {
+            throw ODataException::createInternalServerError(
+                Messages::providersWrapperIDSQPMethodReturnsUnExpectedType(
+                    $entityName,
+                    $methodName
+                )
+            );
+        }
+
+        foreach ($keyDescriptor->getValidatedNamedValues()
+            as $keyName => $valueDescription) {
+            try {
+                $keyProperty = new \ReflectionProperty($entityInstance, $keyName);
+                $keyProperty->setAccessible(true);
+                $keyValue = $keyProperty->getValue($entityInstance);
+                if (is_null($keyValue)) {
+                    throw ODataException::createInternalServerError(
+                        Messages::providersWrapperIDSQPMethodReturnsInstanceWithNullKeyProperties($methodName)
+                    );
+                }
+
+                $convertedValue
+                    = $valueDescription[1]->convert($valueDescription[0]);
+                if ($keyValue != $convertedValue) {
+                    throw ODataException::createInternalServerError(
+                        Messages::providersWrapperIDSQPMethodReturnsInstanceWithNonMatchingKeys($methodName)
+                    );
+                }
+            } catch (\ReflectionException $reflectionException) {
+                //throw ODataException::createInternalServerError(
+                //  Messages::orderByParserFailedToAccessOrInitializeProperty(
+                //      $resourceProperty->getName(), $resourceType->getName()
+                //  )
+                //);
+            }
+        }
+    }
+
+    /**
+     * Assert that the given condition is true.
+     *
+     * @param boolean $condition         Condition to be asserted.
+     * @param string  $conditionAsString String containing message incase
+     *                                   if assertion fails.
+     *
+     * @throws InvalidOperationException Incase if assertion fails.
+     *
+     * @return void
+     */
+    protected function assert($condition, $conditionAsString)
+    {
+        if (!$condition) {
+            throw new InvalidOperationException("Unexpected state, expecting $conditionAsString");
+        }
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -609,30 +609,30 @@
 	 * @param QueryResult $queryResult
 	 * @param string $methodName
 	 */
-	private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
+	private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName) {
 		if (!$queryResult instanceof QueryResult) {
 			throw ODataException::createInternalServerError(
 				Messages::queryProviderReturnsNonQueryResult($methodName)
 			);
 		}
 
-		if($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()){
+		if ($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()) {
 			//and the provider is supposed to handle the ordered paging they must return a count!
-			if($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)){
+			if ($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)) {
 				throw ODataException::createInternalServerError(
 					Messages::queryProviderResultCountMissing($methodName, $queryType)
 				);
 			}
 
 			//If POData is supposed to handle the ordered aging they must return results! (possibly empty)
-			if(!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)){
+			if (!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)) {
 				throw ODataException::createInternalServerError(
 					Messages::queryProviderResultsMissing($methodName, $queryType)
 				);
 			}
 		}
 
-		if(($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)){
+		if (($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)) {
 			throw ODataException::createInternalServerError(
 				Messages::queryProviderResultsMissing($methodName, $queryType)
 			);

src/POData/Providers/Query/QueryResult.php

Spacing +5 added lines, -5 removed lines

@@ -23,18 +23,18 @@
      *
      * @throws \InvalidArgumentException if $count is not numeric
      */
-    public static function adjustCountForPaging($count, $top, $skip){
+    public static function adjustCountForPaging($count, $top, $skip) {
 
-        if(!is_numeric($count)) throw new \InvalidArgumentException('$count');
+        if (!is_numeric($count)) throw new \InvalidArgumentException('$count');
 
         //treat nulls like 0
-        if(is_null($skip)) $skip = 0;
+        if (is_null($skip)) $skip = 0;
 
 
         $count = $count - $skip; //eliminate the skipped records
-        if($count < 0) return 0; //if there aren't enough to skip, the count is 0
+        if ($count < 0) return 0; //if there aren't enough to skip, the count is 0
 
-        if(is_null($top)) return $count; //if there's no top, then it's the count as is
+        if (is_null($top)) return $count; //if there's no top, then it's the count as is
 
         return min($count, $top); //count is top, unless there aren't enough records
 

Braces +15 added lines, -5 removed lines

@@ -25,16 +25,26 @@
      */
     public static function adjustCountForPaging($count, $top, $skip){
 
-        if(!is_numeric($count)) throw new \InvalidArgumentException('$count');
+        if(!is_numeric($count)) {
+            throw new \InvalidArgumentException('$count');
+        }
 
         //treat nulls like 0
-        if(is_null($skip)) $skip = 0;
+        if(is_null($skip)) {
+            $skip = 0;
+        }
 
 
         $count = $count - $skip; //eliminate the skipped records
-        if($count < 0) return 0; //if there aren't enough to skip, the count is 0
-
-        if(is_null($top)) return $count; //if there's no top, then it's the count as is
+        if($count < 0) {
+            return 0;
+        }
+        //if there aren't enough to skip, the count is 0
+
+        if(is_null($top)) {
+            return $count;
+        }
+        //if there's no top, then it's the count as is
 
         return min($count, $top); //count is top, unless there aren't enough records
 

src/POData/Providers/Metadata/Type/Binary.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
             return false;    
         }
 
-        if (!ctype_xdigit($value)){
+        if (!ctype_xdigit($value)) {
             $outValue = null;
             return false;
         }