From 1bdb6875d15272fe96e99d0cdfe13b86f834fa4d Mon Sep 17 00:00:00 2001
From: Shishir <75600200+shishir-intelli@users.noreply.github.com>
Date: Thu, 18 May 2023 19:11:23 +0530
Subject: [PATCH] Added channelID and channelURI for Appgroup. (#260)

---
 src/Api/ApigeeX/Entity/AppGroup.php          | 10 +++++-----
 src/Api/ApigeeX/Entity/AppGroupInterface.php |  6 +++---
 src/Client.php                               |  2 +-
 src/ClientInterface.php                      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Api/ApigeeX/Entity/AppGroup.php b/src/Api/ApigeeX/Entity/AppGroup.php
index 71dc8119..0c8dead0 100644
--- a/src/Api/ApigeeX/Entity/AppGroup.php
+++ b/src/Api/ApigeeX/Entity/AppGroup.php
@@ -38,7 +38,7 @@ class AppGroup extends Entity implements AppGroupInterface
     use StatusPropertyAwareTrait;
 
     /** @var string|null */
-    protected $correlationId;
+    protected $channelUri;
 
     /** @var string|null */
     protected $channelId;
@@ -57,17 +57,17 @@ public function __construct(array $values = [])
     /**
      * {@inheritdoc}
      */
-    public function setCorrelationId(string $correlationId): void
+    public function setChannelUri(string $channelUri): void
     {
-        $this->correlationId = $correlationId;
+        $this->channelUri = $channelUri;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getCorrelationId(): ?string
+    public function getChannelUri(): ?string
     {
-        return $this->correlationId;
+        return $this->channelUri;
     }
 
     /**
diff --git a/src/Api/ApigeeX/Entity/AppGroupInterface.php b/src/Api/ApigeeX/Entity/AppGroupInterface.php
index 3e8e19ee..ecd3959e 100644
--- a/src/Api/ApigeeX/Entity/AppGroupInterface.php
+++ b/src/Api/ApigeeX/Entity/AppGroupInterface.php
@@ -34,14 +34,14 @@ interface AppGroupInterface extends AttributesPropertyInterface,
     CommonEntityPropertiesInterface
 {
     /**
-     * @param string $correlationId
+     * @param string $channelUri
      */
-    public function setCorrelationId(string $correlationId): void;
+    public function setChannelUri(string $channelUri): void;
 
     /**
      * @return string|null
      */
-    public function getCorrelationId(): ?string;
+    public function getChannelUri(): ?string;
 
     /**
      * @param string $channelId
diff --git a/src/Client.php b/src/Client.php
index c0c49b63..9bf0a3f4 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -33,11 +33,11 @@
 use Http\Client\Common\Plugin\HistoryPlugin;
 use Http\Client\Common\Plugin\RetryPlugin;
 use Http\Client\Exception;
-use Http\Client\HttpClient;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Discovery\UriFactoryDiscovery;
 use Http\Message\Authentication;
 use Http\Message\UriFactory;
+use Psr\Http\Client\ClientInterface as HttpClient;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
diff --git a/src/ClientInterface.php b/src/ClientInterface.php
index 93912bce..cebaa88e 100644
--- a/src/ClientInterface.php
+++ b/src/ClientInterface.php
@@ -19,8 +19,8 @@
 namespace Apigee\Edge;
 
 use Apigee\Edge\HttpClient\Utility\JournalInterface;
-use Http\Client\HttpClient;
 use Http\Message\UriFactory;
+use Psr\Http\Client\ClientInterface as HttpClient;
 use Psr\Http\Message\ResponseInterface;
 
 /**