- changed echo API surface to match Java

Author: navinger

appengine/standard/endpoints-frameworks-v2/echo/main.py

@@ -25,12 +25,12 @@
 
 # [START messages]
 class EchoRequest(messages.Message):
- content = messages.StringField(1)
+ message = messages.StringField(1)
 
 
 class EchoResponse(messages.Message):
  """A proto Message that contains a simple string field."""
- content = messages.StringField(1)
+ message = messages.StringField(1)
 
 
 ECHO_RESOURCE = endpoints.ResourceContainer(
@@ -53,8 +53,8 @@ class EchoApi(remote.Service):
  http_method='POST',
  name='echo')
  def echo(self, request):
- output_content = ' '.join([request.content] * request.n)
- return EchoResponse(content=output_content)
+ output_message = ' '.join([request.message] * request.n)
+ return EchoResponse(message=output_message)
  # [END echo_api_method]
 
  @endpoints.method(
@@ -66,8 +66,8 @@ def echo(self, request):
  http_method='POST',
  name='echo_path_parameter')
  def echo_path_parameter(self, request):
- output_content = ' '.join([request.content] * request.n)
- return EchoResponse(content=output_content)
+ output_message = ' '.join([request.message] * request.n)
+ return EchoResponse(message=output_message)
 
  @endpoints.method(
  # This method takes a ResourceContainer defined above.
@@ -80,14 +80,14 @@ def echo_path_parameter(self, request):
  api_key_required=True)
  def echo_api_key(self, request):
  key, key_type = request.get_unrecognized_field_info('key')
- return EchoResponse(content=key)
+ return EchoResponse(message=key)
 
  @endpoints.method(
  # This method takes an empty request body.
  message_types.VoidMessage,
  # This method returns an Echo message.
  EchoResponse,
- path='echo/getUserEmail',
+ path='echo/email',
  http_method='GET',
  # Require auth tokens to have the following scopes to access this API.
  scopes=[endpoints.EMAIL_SCOPE],
@@ -99,7 +99,7 @@ def get_user_email(self, request):
  # raise 401 Unauthorized.
  if not user:
  raise endpoints.UnauthorizedException
- return EchoResponse(content=user.email())
+ return EchoResponse(message=user.email())
 # [END echo_api_class]
 
 

appengine/standard/endpoints-frameworks-v2/echo/main_test.py

@@ -22,9 +22,9 @@
 
 def test_echo():
  api = main.EchoApi()
- request = main.EchoApi.echo.remote.request_type(content='Hello world!')
+ request = main.EchoApi.echo.remote.request_type(message='Hello world!')
  response = api.echo(request)
- assert 'Hello world!' == response.content
+ assert 'Hello world!' == response.message
 
 
 def test_get_user_email():
@@ -38,4 +38,4 @@ def test_get_user_email():
  user_mock.return_value = mock.Mock()
  user_mock.return_value.email.return_value = 'user@example.com'
  response = api.get_user_email(message_types.VoidMessage())
- assert 'user@example.com' == response.content
+ assert 'user@example.com' == response.message