Merge branch 'apigee:3.x' into php8.2-support

divya-intelli · Aug 29, 2023 · 1ece826 · 1ece826
2 parents fd74c3a + 230b0c5
commit 1ece826
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 0 deletions.
diff --git a/...s/apigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityAddMemberEventTest.php b/...s/apigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityAddMemberEventTest.php
@@ -56,6 +56,15 @@ protected function setUp(): void {
     $this->installEntitySchema('team_member_role');
 
     $this->addOrganizationMatchedResponse();
+
+    // Setting teams cache to 900 to make sure null value is not returned in getCacheMaxAge().
+    $config_factory = \Drupal::configFactory();
+    $config = $config_factory->getEditable('apigee_edge_teams.team_settings');
+
+    if (NULL === $config->get('cache_expiration')) {
+      $config->set('cache_expiration', 900);
+      $config->save(TRUE);
+    }
   }
 
   /**

diff --git a/...pigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityRemoveMemberEventTest.php b/...pigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityRemoveMemberEventTest.php
@@ -55,6 +55,15 @@ protected function setUp(): void {
     $this->installEntitySchema('team_member_role');
 
     $this->addOrganizationMatchedResponse();
+
+    // Setting teams cache to 900 to make sure null value is not returned in getCacheMaxAge().
+    $config_factory = \Drupal::configFactory();
+    $config = $config_factory->getEditable('apigee_edge_teams.team_settings');
+
+    if (NULL === $config->get('cache_expiration')) {
+      $config->set('cache_expiration', 900);
+      $config->save(TRUE);
+    }
   }
 
   /**

diff --git a/modules/apigee_edge_debug/src/SDKConnector.php b/modules/apigee_edge_debug/src/SDKConnector.php
@@ -53,6 +53,13 @@ class SDKConnector extends OriginalSDKConnector implements SDKConnectorInterface
    */
   private $innerService;
 
+  /**
+   * The service ID.
+   *
+   * @var string
+   */
+  public $_serviceId;
+
   /**
    * Constructs a new SDKConnector.
    *

diff --git a/modules/apigee_edge_teams/src/Entity/Team.php b/modules/apigee_edge_teams/src/Entity/Team.php
@@ -387,4 +387,11 @@ protected static function propertyToBaseFieldBlackList(): array {
     ]);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge(): int {
+    return \Drupal::config('apigee_edge_teams.team_settings')->get('cache_expiration');
+  }
+
 }
diff --git a/modules/apigee_edge_teams/src/Entity/TeamApp.php b/modules/apigee_edge_teams/src/Entity/TeamApp.php
@@ -224,4 +224,11 @@ protected function urlRouteParameters($rel) {
     return $params;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge(): int {
+    return \Drupal::config('apigee_edge_teams.team_app_settings')->get('cache_expiration');
+  }
+
 }
diff --git a/src/Entity/ApiProduct.php b/src/Entity/ApiProduct.php
@@ -328,4 +328,11 @@ public function setScopes(string ...$scopes): void {
     $this->decorated->setScopes(...$scopes);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge(): int {
+    return \Drupal::config('apigee_edge.api_product_settings')->get('cache_expiration');
+  }
+
 }
diff --git a/src/Entity/Controller/OrganizationController.php b/src/Entity/Controller/OrganizationController.php
@@ -66,6 +66,13 @@ final class OrganizationController implements OrganizationControllerInterface {
    */
   private $connector;
 
+  /**
+   * Apigee organization details.
+   *
+   * @var \Apigee\Edge\Api\Management\Entity\Organization
+   */
+  private $organization;
+
   /**
    * OrganizationController constructor.
    *

diff --git a/src/Entity/Developer.php b/src/Entity/Developer.php
@@ -519,4 +519,11 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti
     $storage->resetCache($developer_mail_id_map);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge(): int {
+    return \Drupal::config('apigee_edge.developer_settings')->get('cache_expiration');
+  }
+
 }
diff --git a/src/Entity/DeveloperApp.php b/src/Entity/DeveloperApp.php
@@ -290,4 +290,11 @@ protected function urlRouteParameters($rel) {
     return $params;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge(): int {
+    return \Drupal::config('apigee_edge.developer_app_settings')->get('cache_expiration');
+  }
+
 }
diff --git a/tests/modules/apigee_edge_test/src/SDKConnector.php b/tests/modules/apigee_edge_test/src/SDKConnector.php
@@ -55,6 +55,13 @@ final class SDKConnector extends DecoratedSDKConnector implements SDKConnectorIn
    */
   private $logger;
 
+  /**
+   * The service ID.
+   *
+   * @var string
+   */
+  public $_serviceId;
+
   /**
    * Constructs a new SDKConnector.
    *

diff --git a/tests/modules/apigee_edge_test/src/UserDeveloperConverter.php b/tests/modules/apigee_edge_test/src/UserDeveloperConverter.php
@@ -43,6 +43,13 @@ final class UserDeveloperConverter extends DecoratedUserDeveloperConverter {
    */
   private $innerService;
 
+  /**
+   * The service ID.
+   *
+   * @var string
+   */
+  public $_serviceId;
+
   /**
    * UserToDeveloper constructor.
    *