Skip to content

Factor out API helper classes from 'pubsub.Connection'. #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 8 commits into from
Apr 22, 2016
Merged

Factor out API helper classes from 'pubsub.Connection'. #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
159d63a
Add 'Client.{publisher,subscriber,iam_policy}_api' properties.
tseaver Apr 20, 2016
2c7c58b
Move 'list_topics' from 'Connection' to '_PublisherAPI'.
tseaver Apr 20, 2016
8edaec6
Move 'list_subscriptions' from 'Connection' to '_SubscriberAPI'.
tseaver Apr 20, 2016
2a54ffb
Move remaining publisher API methods from 'Connection' to '_Publisher…
tseaver Apr 20, 2016
75bc6de
Move remaining subscriber API methods from 'Connection' to '_Subscrib…
tseaver Apr 20, 2016
080313c
Move remaining IAM policy API methods from 'Connection' to '_IAMPolic…
tseaver Apr 20, 2016
77de8ed
'assertTrue(isinstance' -> 'assertIsInstance'.
tseaver Apr 22, 2016
141eab5
Remove now-redundant mock connections.
tseaver Apr 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions gcloud/pubsub/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

from gcloud.client import JSONClient
from gcloud.pubsub.connection import Connection
from gcloud.pubsub.connection import _PublisherAPI
from gcloud.pubsub.connection import _SubscriberAPI
from gcloud.pubsub.connection import _IAMPolicyAPI
from gcloud.pubsub.subscription import Subscription
from gcloud.pubsub.topic import Topic

Expand All @@ -43,6 +46,28 @@ class Client(JSONClient):
"""

_connection_class = Connection
_publisher_api = _subscriber_api = _iam_policy_api = None

@property
def publisher_api(self):
"""Helper for publisher-related API calls."""
if self._publisher_api is None:
self._publisher_api = _PublisherAPI(self.connection)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

return self._publisher_api

@property
def subscriber_api(self):
"""Helper for subscriber-related API calls."""
if self._subscriber_api is None:
self._subscriber_api = _SubscriberAPI(self.connection)
return self._subscriber_api

@property
def iam_policy_api(self):
"""Helper for IAM policy-related API calls."""
if self._iam_policy_api is None:
self._iam_policy_api = _IAMPolicyAPI(self.connection)
return self._iam_policy_api

def list_topics(self, page_size=None, page_token=None):
"""List topics for the project associated with this client.
Expand All @@ -65,8 +90,8 @@ def list_topics(self, page_size=None, page_token=None):
more topics can be retrieved with another call (pass that
value as ``page_token``).
"""
conn = self.connection
resources, next_token = conn.list_topics(
api = self.publisher_api
resources, next_token = api.list_topics(
self.project, page_size, page_token)
topics = [Topic.from_api_repr(resource, self)
for resource in resources]
Expand Down Expand Up @@ -96,8 +121,8 @@ def list_subscriptions(self, page_size=None, page_token=None):
more topics can be retrieved with another call (pass that
value as ``page_token``).
"""
conn = self.connection
resources, next_token = conn.list_subscriptions(
api = self.subscriber_api
resources, next_token = api.list_subscriptions(
self.project, page_size, page_token)
topics = {}
subscriptions = [Subscription.from_api_repr(resource, self,
Expand Down
Loading