From 958415a0257719e6a812283e2d4d3c17a609b724 Mon Sep 17 00:00:00 2001 From: Jasmine Jaksic Date: Fri, 25 Nov 2016 20:32:52 -0800 Subject: [PATCH 1/2] Replaced 'swagger.yaml' with openapi.yaml. Refer to b/32670418. --- endpoints/getting-started/src/main/appengine/app.yaml | 2 +- .../src/main/appengine/{swagger.yaml => openapi.yaml} | 0 .../src/main/java/com/example/endpoints/AuthInfoServlet.java | 2 +- flexible/endpoints/README.md | 2 +- flexible/endpoints/src/main/appengine/app.yaml | 2 +- .../endpoints/src/main/appengine/{swagger.yaml => openapi.yaml} | 0 .../src/main/java/com/example/endpoints/AuthInfoServlet.java | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename endpoints/getting-started/src/main/appengine/{swagger.yaml => openapi.yaml} (100%) rename flexible/endpoints/src/main/appengine/{swagger.yaml => openapi.yaml} (100%) diff --git a/endpoints/getting-started/src/main/appengine/app.yaml b/endpoints/getting-started/src/main/appengine/app.yaml index 5882f5a8952..ddd89e1e82c 100644 --- a/endpoints/getting-started/src/main/appengine/app.yaml +++ b/endpoints/getting-started/src/main/appengine/app.yaml @@ -10,4 +10,4 @@ beta_settings: # Enable Google Cloud Endpoints API management. use_endpoints_api_management: true # Specify the Swagger API specification. - endpoints_swagger_spec_file: swagger.yaml + endpoints_swagger_spec_file: openapi.yaml diff --git a/endpoints/getting-started/src/main/appengine/swagger.yaml b/endpoints/getting-started/src/main/appengine/openapi.yaml similarity index 100% rename from endpoints/getting-started/src/main/appengine/swagger.yaml rename to endpoints/getting-started/src/main/appengine/openapi.yaml diff --git a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java index 233ea414239..4ed7ba4a813 100644 --- a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java +++ b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java @@ -29,7 +29,7 @@ /** * A servlet that returns authentication information. - * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token). + * See openapi.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token). */ @WebServlet("/auth/info/*") public class AuthInfoServlet extends HttpServlet { diff --git a/flexible/endpoints/README.md b/flexible/endpoints/README.md index 8ff97e71bde..91a30732a2e 100644 --- a/flexible/endpoints/README.md +++ b/flexible/endpoints/README.md @@ -3,7 +3,7 @@ This sample demonstrates how to use Google Cloud Endpoints on Google App Engine ## Edit the Swagger API specification -Open the [src/main/appengine/swagger.yaml](src/main/appengine/swagger.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id. +Open the [src/main/appengine/openapi.yaml](src/main/appengine/openapi.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id. ## Running locally $ mvn jetty:run diff --git a/flexible/endpoints/src/main/appengine/app.yaml b/flexible/endpoints/src/main/appengine/app.yaml index 5882f5a8952..ddd89e1e82c 100644 --- a/flexible/endpoints/src/main/appengine/app.yaml +++ b/flexible/endpoints/src/main/appengine/app.yaml @@ -10,4 +10,4 @@ beta_settings: # Enable Google Cloud Endpoints API management. use_endpoints_api_management: true # Specify the Swagger API specification. - endpoints_swagger_spec_file: swagger.yaml + endpoints_swagger_spec_file: openapi.yaml diff --git a/flexible/endpoints/src/main/appengine/swagger.yaml b/flexible/endpoints/src/main/appengine/openapi.yaml similarity index 100% rename from flexible/endpoints/src/main/appengine/swagger.yaml rename to flexible/endpoints/src/main/appengine/openapi.yaml diff --git a/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java index 233ea414239..4ed7ba4a813 100644 --- a/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java +++ b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java @@ -29,7 +29,7 @@ /** * A servlet that returns authentication information. - * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token). + * See openapi.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token). */ @WebServlet("/auth/info/*") public class AuthInfoServlet extends HttpServlet { From 2483e097c4685f8cf906a9279f3b4e0c87a0911a Mon Sep 17 00:00:00 2001 From: Jasmine Jaksic Date: Mon, 28 Nov 2016 14:23:29 -0800 Subject: [PATCH 2/2] Updating Swagger API references --- endpoints/getting-started/src/main/appengine/app.yaml | 2 +- flexible/endpoints/README.md | 2 +- flexible/endpoints/src/main/appengine/app.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/endpoints/getting-started/src/main/appengine/app.yaml b/endpoints/getting-started/src/main/appengine/app.yaml index ddd89e1e82c..2f76f203522 100644 --- a/endpoints/getting-started/src/main/appengine/app.yaml +++ b/endpoints/getting-started/src/main/appengine/app.yaml @@ -9,5 +9,5 @@ handlers: beta_settings: # Enable Google Cloud Endpoints API management. use_endpoints_api_management: true - # Specify the Swagger API specification. + # Specify the Open API specification. endpoints_swagger_spec_file: openapi.yaml diff --git a/flexible/endpoints/README.md b/flexible/endpoints/README.md index 91a30732a2e..ee6dd61a9eb 100644 --- a/flexible/endpoints/README.md +++ b/flexible/endpoints/README.md @@ -1,7 +1,7 @@ # Google Cloud Endpoints on App Engine flexible environment This sample demonstrates how to use Google Cloud Endpoints on Google App Engine Flexible Environment using Java. -## Edit the Swagger API specification +## Edit the Open API specification Open the [src/main/appengine/openapi.yaml](src/main/appengine/openapi.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id. diff --git a/flexible/endpoints/src/main/appengine/app.yaml b/flexible/endpoints/src/main/appengine/app.yaml index ddd89e1e82c..2f76f203522 100644 --- a/flexible/endpoints/src/main/appengine/app.yaml +++ b/flexible/endpoints/src/main/appengine/app.yaml @@ -9,5 +9,5 @@ handlers: beta_settings: # Enable Google Cloud Endpoints API management. use_endpoints_api_management: true - # Specify the Swagger API specification. + # Specify the Open API specification. endpoints_swagger_spec_file: openapi.yaml