From ae4908491ac18f062a84660e647a668d3ef2124b Mon Sep 17 00:00:00 2001 From: aozarov Date: Tue, 26 Mar 2019 10:59:21 -0700 Subject: [PATCH 1/3] Update Alert Center scopes for using constant. --- adminSDK/alertcenter/quickstart/build.gradle | 2 +- .../src/main/java/AdminSDKAlertCenterQuickstart.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/adminSDK/alertcenter/quickstart/build.gradle b/adminSDK/alertcenter/quickstart/build.gradle index 25d08517..d044218e 100644 --- a/adminSDK/alertcenter/quickstart/build.gradle +++ b/adminSDK/alertcenter/quickstart/build.gradle @@ -14,5 +14,5 @@ repositories { dependencies { compile 'com.google.api-client:google-api-client:1.20.0' compile 'com.google.auth:google-auth-library-oauth2-http:0.11.0' - compile 'com.google.apis:google-api-services-alertcenter:v1beta1-rev7-1.25.0' + compile 'com.google.apis:google-api-services-alertcenter:v1beta1-rev20190221-1.28.0' } \ No newline at end of file diff --git a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java index cfca6b29..de711544 100644 --- a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java +++ b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java @@ -19,6 +19,7 @@ import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.alertcenter.v1beta1.AlertCenter; +import com.google.api.services.alertcenter.v1beta1.AlertCenterScopes; import com.google.api.services.alertcenter.v1beta1.model.Alert; import com.google.api.services.alertcenter.v1beta1.model.AlertFeedback; import com.google.api.services.alertcenter.v1beta1.model.ListAlertsResponse; @@ -36,12 +37,6 @@ public class AdminSDKAlertCenterQuickstart { private static final String APPLICATION_NAME = "Google Admin SDK Alert Center API Java Quickstart"; private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance(); - /** - * Global instance of the scopes required by this quickstart. If modifying these scopes, delete - * your previously saved tokens/ folder. - */ - private static final List SCOPES = Collections - .singletonList("https://www.googleapis.com/auth/apps.alerts"); private static final String CREDENTIALS_FILE_PATH = "/credentials.json"; private static final String DELEGATED_ADMIN_EMAIL = "admin@xxx.com"; @@ -61,7 +56,7 @@ private static Credentials getCredentials(String delegatedAdminEmail) throws IOE GoogleCredentials credentials = ServiceAccountCredentials .fromStream(in) .createDelegated(delegatedAdminEmail) - .createScoped(SCOPES); + .createScoped(AlertCenterScopes.all()); // [END admin_sdk_alertcenter_get_credentials] return credentials; } From f979dc89ca067626e762d6b4f9a3c0b80e707531 Mon Sep 17 00:00:00 2001 From: aozarov Date: Tue, 26 Mar 2019 12:46:36 -0700 Subject: [PATCH 2/3] Replace scope all() with an explicit list of scopes. --- .../src/main/java/AdminSDKAlertCenterQuickstart.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java index de711544..5140c1e4 100644 --- a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java +++ b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java @@ -37,6 +37,13 @@ public class AdminSDKAlertCenterQuickstart { private static final String APPLICATION_NAME = "Google Admin SDK Alert Center API Java Quickstart"; private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance(); + + /** + * Global instance of the scopes required by this quickstart. + * If modifying these scopes, delete your previously saved tokens/folder. + */ + private static final List SCOPES = + Collections.singletonList(AlertCenterScopes.APPS_ALERTS); private static final String CREDENTIALS_FILE_PATH = "/credentials.json"; private static final String DELEGATED_ADMIN_EMAIL = "admin@xxx.com"; @@ -56,7 +63,7 @@ private static Credentials getCredentials(String delegatedAdminEmail) throws IOE GoogleCredentials credentials = ServiceAccountCredentials .fromStream(in) .createDelegated(delegatedAdminEmail) - .createScoped(AlertCenterScopes.all()); + .createScoped(SCOPES); // [END admin_sdk_alertcenter_get_credentials] return credentials; } From c14e0b8268fe42cad680d067b3ecc5898cc73d07 Mon Sep 17 00:00:00 2001 From: aozarov Date: Tue, 26 Mar 2019 12:58:02 -0700 Subject: [PATCH 3/3] Make it clear that "tokens/" is refering to the name of the folder. --- .../quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java index 5140c1e4..d80f42eb 100644 --- a/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java +++ b/adminSDK/alertcenter/quickstart/src/main/java/AdminSDKAlertCenterQuickstart.java @@ -40,7 +40,7 @@ public class AdminSDKAlertCenterQuickstart { /** * Global instance of the scopes required by this quickstart. - * If modifying these scopes, delete your previously saved tokens/folder. + * If modifying these scopes, delete your previously saved "tokens/" folder. */ private static final List SCOPES = Collections.singletonList(AlertCenterScopes.APPS_ALERTS);