api samples: Update samples to 1.16.0-rc

https://codereview.appspot.com/11587043

Author: ngmiceli-g

adexchangebuyer-cmdline-sample/pom.xml

@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-adexchangebuyer</artifactId>
-      <version>v1.2-rev6-1.15.0-rc</version>
+      <version>v1.2-rev11-1.16.0-rc</version>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -128,8 +128,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <project.http.version>1.15.0-rc</project.http.version>
-    <project.oauth.version>1.15.0-rc</project.oauth.version>
+    <project.http.version>1.16.0-rc</project.http.version>
+    <project.oauth.version>1.16.0-rc</project.oauth.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>

adexchangebuyer-cmdline-sample/src/main/java/com/google/api/services/samples/adexchangebuyer/cmdline/AdExchangeBuyerSample.java

@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2012 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -16,18 +16,18 @@
 
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
-import com.google.api.client.extensions.java6.auth.oauth2.FileCredentialStore;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
 import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
 import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.util.store.DataStoreFactory;
+import com.google.api.client.util.store.FileDataStoreFactory;
 import com.google.api.services.adexchangebuyer.Adexchangebuyer;
 import com.google.api.services.adexchangebuyer.AdexchangebuyerScopes;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
@@ -51,7 +51,17 @@ public class AdExchangeBuyerSample {
    * blank, the application will log a warning. Suggested format is "MyCompany-ProductName/1.0".
    */
   private static final String APPLICATION_NAME = "";
-  
+
+  /** Directory to store user credentials. */
+  private static final java.io.File DATA_STORE_DIR =
+      new java.io.File(System.getProperty("user.home"), ".store/ad_exchange_buyer_sample");
+
+  /**
+   * Global instance of the {@link DataStoreFactory}. The best practice is to make it a single
+   * globally shared instance across your application.
+   */
+  private static FileDataStoreFactory DATA_STORE_FACTORY;
+
   /** Global instance of the HTTP transport. */
   private static HttpTransport HTTP_TRANSPORT;
 
@@ -73,22 +83,18 @@ JSON_FACTORY, new InputStreamReader(
           + "adexchangebuyer-cmdline-sample/src/main/resources/client_secrets.json");
       System.exit(1);
     }
-    // set up file credential store
-    FileCredentialStore credentialStore = new FileCredentialStore(
-        new File(System.getProperty("user.home"), ".credentials/adexchangebuyer.json"),
-        JSON_FACTORY);
     // set up authorization code flow
     GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
         HTTP_TRANSPORT, JSON_FACTORY, clientSecrets,
-        Collections.singleton(AdexchangebuyerScopes.ADEXCHANGE_BUYER)).setCredentialStore(
-        credentialStore).build();
+        Collections.singleton(AdexchangebuyerScopes.ADEXCHANGE_BUYER)).setDataStoreFactory(
+        DATA_STORE_FACTORY).build();
     // authorize
     return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
   }
 
   /**
    * Performs all necessary setup steps for running requests against the API.
-   * 
+   *
    * @return An initialized AdSense service object.
    * @throws Exception
    */
@@ -98,8 +104,7 @@ private static Adexchangebuyer initClient() throws Exception {
 
     // Set up API client.
     Adexchangebuyer client = new Adexchangebuyer.Builder(
-        HTTP_TRANSPORT, JSON_FACTORY, credential)
-        .setApplicationName(APPLICATION_NAME).build();
+        HTTP_TRANSPORT, JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME).build();
 
     return client;
   }
@@ -118,12 +123,13 @@ private static void initSamples() {
 
   /**
    * Runs all the Ad Exchange Buyer API samples.
-   * 
+   *
    * @param args command-line arguments.
    * @throws Exception
    */
   public static void main(String[] args) throws Exception {
     HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
+    DATA_STORE_FACTORY = new FileDataStoreFactory(DATA_STORE_DIR);
     initSamples();
     Adexchangebuyer client = initClient();
     BaseSample sample = null;
@@ -141,7 +147,7 @@ public static void main(String[] args) throws Exception {
 
   /**
    * Prints the list of available code samples and prompts the user to select one.
-   * 
+   *
    * @return The selected sample or null if the user selected to exit
    * @throws IOException
    */

adsense-cmdline-sample/pom.xml

@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-adsense</artifactId>
-      <version>v1.3-rev2-1.15.0-rc</version>
+      <version>v1.3-rev19-1.16.0-rc</version>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -128,8 +128,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <project.http.version>1.15.0-rc</project.http.version>
-    <project.oauth.version>1.15.0-rc</project.oauth.version>
+    <project.http.version>1.16.0-rc</project.http.version>
+    <project.oauth.version>1.16.0-rc</project.oauth.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>

adsense-cmdline-sample/src/main/java/com/google/api/services/samples/adsense/cmdline/AdSenseSample.java

@@ -16,7 +16,6 @@
 
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
-import com.google.api.client.extensions.java6.auth.oauth2.FileCredentialStore;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
 import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
 import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
@@ -25,6 +24,8 @@
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.util.store.DataStoreFactory;
+import com.google.api.client.util.store.FileDataStoreFactory;
 import com.google.api.services.adsense.AdSense;
 import com.google.api.services.adsense.AdSenseScopes;
 import com.google.api.services.adsense.model.Accounts;
@@ -33,14 +34,13 @@
 import com.google.api.services.adsense.model.CustomChannels;
 import com.google.api.services.adsense.model.SavedReports;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collections;
 
 /**
- * A sample application that runs multiple requests against the AdSense Management API.
- * These include:
+ * A sample application that runs multiple requests against the AdSense Management API. These
+ * include:
  * <ul>
  * <li>Listing all AdSense accounts for a user</li>
  * <li>Listing the sub-account tree for an account</li>
@@ -69,6 +69,16 @@ public class AdSenseSample {
    */
   private static final String APPLICATION_NAME = "";
 
+  /** Directory to store user credentials. */
+  private static final java.io.File DATA_STORE_DIR =
+      new java.io.File(System.getProperty("user.home"), ".store/adsense_management_sample");
+
+  /**
+   * Global instance of the {@link DataStoreFactory}. The best practice is to make it a single
+   * globally shared instance across your application.
+   */
+  private static FileDataStoreFactory DATA_STORE_FACTORY;
+  
   /** Global instance of the JSON factory. */
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
 
@@ -91,21 +101,18 @@ private static Credential authorize() throws Exception {
           + "adsense-cmdline-sample/src/main/resources/client_secrets.json");
       System.exit(1);
     }
-    // set up file credential store
-    FileCredentialStore credentialStore = new FileCredentialStore(
-        new File(System.getProperty("user.home"), ".credentials/adsense.json"),
-        JSON_FACTORY);
     // set up authorization code flow
     GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
         httpTransport, JSON_FACTORY, clientSecrets,
-        Collections.singleton(AdSenseScopes.ADSENSE_READONLY)).setCredentialStore(
-        credentialStore).build();
+        Collections.singleton(AdSenseScopes.ADSENSE_READONLY)).setDataStoreFactory(
+        DATA_STORE_FACTORY).build();
     // authorize
     return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
   }
 
   /**
    * Performs all necessary setup steps for running requests against the API.
+   *
    * @return An initialized AdSense service object.
    * @throws Exception
    */
@@ -115,78 +122,78 @@ private static AdSense initializeAdsense() throws Exception {
 
     // Set up AdSense Management API client.
     AdSense adsense = new AdSense.Builder(
-        new NetHttpTransport(), JSON_FACTORY, credential)
-        .setApplicationName(APPLICATION_NAME).build();
+        new NetHttpTransport(), JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME)
+        .build();
 
     return adsense;
   }
 
   /**
    * Runs all the AdSense Management API samples.
+   *
    * @param args command-line arguments.
    */
   public static void main(String[] args) {
     try {
-      try {
-        httpTransport = GoogleNetHttpTransport.newTrustedTransport();
-        AdSense adsense = initializeAdsense();
-
-        Accounts accounts = GetAllAccounts.run(adsense, MAX_LIST_PAGE_SIZE);
-        if ((accounts.getItems() != null) && !accounts.getItems().isEmpty()) {
-          // Get an example account ID, so we can run the following sample.
-          String exampleAccountId = accounts.getItems().get(0).getId();
-          GetAccountTree.run(adsense, exampleAccountId);
-          GetAllAdClientsForAccount.run(adsense, exampleAccountId, MAX_LIST_PAGE_SIZE);
-        }
+      httpTransport = GoogleNetHttpTransport.newTrustedTransport();
+      DATA_STORE_FACTORY = new FileDataStoreFactory(DATA_STORE_DIR);
+      AdSense adsense = initializeAdsense();
+
+      Accounts accounts = GetAllAccounts.run(adsense, MAX_LIST_PAGE_SIZE);
+      if ((accounts.getItems() != null) && !accounts.getItems().isEmpty()) {
+        // Get an example account ID, so we can run the following sample.
+        String exampleAccountId = accounts.getItems().get(0).getId();
+        GetAccountTree.run(adsense, exampleAccountId);
+        GetAllAdClientsForAccount.run(adsense, exampleAccountId, MAX_LIST_PAGE_SIZE);
+      }
 
-        AdClients adClients = GetAllAdClients.run(adsense, MAX_LIST_PAGE_SIZE);
-        if ((adClients.getItems() != null) && !adClients.getItems().isEmpty()) {
-          // Get an ad client ID, so we can run the rest of the samples.
-          String exampleAdClientId = adClients.getItems().get(0).getId();
-
-          AdUnits units = GetAllAdUnits.run(adsense, exampleAdClientId, MAX_LIST_PAGE_SIZE);
-          if ((units.getItems() != null) && !units.getItems().isEmpty()) {
-            // Get an example ad unit ID, so we can run the following sample.
-            String exampleAdUnitId = units.getItems().get(0).getId();
-            GetAllCustomChannelsForAdUnit.run(adsense, exampleAdClientId, exampleAdUnitId,
-                MAX_LIST_PAGE_SIZE);
-          }
-
-          CustomChannels channels = GetAllCustomChannels.run(adsense, exampleAdClientId,
-              MAX_LIST_PAGE_SIZE);
-          if ((channels.getItems() != null) && !channels.getItems().isEmpty()) {
-            // Get an example custom channel ID, so we can run the following sample.
-            String exampleCustomChannelId = channels.getItems().get(0).getId();
-            GetAllAdUnitsForCustomChannel.run(adsense, exampleAdClientId, exampleCustomChannelId,
-                MAX_LIST_PAGE_SIZE);
-          }
-
-          GetAllUrlChannels.run(adsense, exampleAdClientId, MAX_LIST_PAGE_SIZE);
-          GenerateReport.run(adsense, exampleAdClientId);
-          GenerateReportWithPaging.run(adsense, exampleAdClientId, MAX_REPORT_PAGE_SIZE);
-        } else {
-          System.out.println("No ad clients found, unable to run remaining methods.");
+      AdClients adClients = GetAllAdClients.run(adsense, MAX_LIST_PAGE_SIZE);
+      if ((adClients.getItems() != null) && !adClients.getItems().isEmpty()) {
+        // Get an ad client ID, so we can run the rest of the samples.
+        String exampleAdClientId = adClients.getItems().get(0).getId();
+
+        AdUnits units = GetAllAdUnits.run(adsense, exampleAdClientId, MAX_LIST_PAGE_SIZE);
+        if ((units.getItems() != null) && !units.getItems().isEmpty()) {
+          // Get an example ad unit ID, so we can run the following sample.
+          String exampleAdUnitId = units.getItems().get(0).getId();
+          GetAllCustomChannelsForAdUnit.run(
+              adsense, exampleAdClientId, exampleAdUnitId, MAX_LIST_PAGE_SIZE);
         }
 
-        SavedReports savedReports = GetAllSavedReports.run(adsense, MAX_REPORT_PAGE_SIZE);
-        if ((savedReports.getItems() != null) && !savedReports.getItems().isEmpty()){
-          // Get a saved report ID, so we can generate its report.
-          String exampleSavedReportId = savedReports.getItems().get(0).getId();
-          GenerateSavedReport.run(adsense, exampleSavedReportId);
-        } else {
-          System.out.println("No saved report found.");
+        CustomChannels channels =
+            GetAllCustomChannels.run(adsense, exampleAdClientId, MAX_LIST_PAGE_SIZE);
+        if ((channels.getItems() != null) && !channels.getItems().isEmpty()) {
+          // Get an example custom channel ID, so we can run the following sample.
+          String exampleCustomChannelId = channels.getItems().get(0).getId();
+          GetAllAdUnitsForCustomChannel.run(
+              adsense, exampleAdClientId, exampleCustomChannelId, MAX_LIST_PAGE_SIZE);
         }
 
-        GetAllSavedAdStyles.run(adsense, MAX_LIST_PAGE_SIZE);
+        GetAllUrlChannels.run(adsense, exampleAdClientId, MAX_LIST_PAGE_SIZE);
+        GenerateReport.run(adsense, exampleAdClientId);
+        GenerateReportWithPaging.run(adsense, exampleAdClientId, MAX_REPORT_PAGE_SIZE);
+      } else {
+        System.out.println("No ad clients found, unable to run remaining methods.");
+      }
 
-        GetAllDimensions.run(adsense);
-        GetAllMetrics.run(adsense);
+      SavedReports savedReports = GetAllSavedReports.run(adsense, MAX_REPORT_PAGE_SIZE);
+      if ((savedReports.getItems() != null) && !savedReports.getItems().isEmpty()) {
+        // Get a saved report ID, so we can generate its report.
+        String exampleSavedReportId = savedReports.getItems().get(0).getId();
+        GenerateSavedReport.run(adsense, exampleSavedReportId);
+      } else {
+        System.out.println("No saved report found.");
+      }
 
-        GetAllAlerts.run(adsense);
+      GetAllSavedAdStyles.run(adsense, MAX_LIST_PAGE_SIZE);
 
-      } catch (IOException e) {
-        System.err.println(e.getMessage());
-      }
+      GetAllDimensions.run(adsense);
+      GetAllMetrics.run(adsense);
+
+      GetAllAlerts.run(adsense);
+
+    } catch (IOException e) {
+      System.err.println(e.getMessage());
     } catch (Throwable t) {
       t.printStackTrace();
     }

adsensehost-cmdline-sample/pom.xml

@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-adsensehost</artifactId>
-      <version>v4.1-rev36-1.15.0-rc</version>
+      <version>v4.1-rev60-1.16.0-rc</version>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -128,8 +128,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <project.http.version>1.15.0-rc</project.http.version>
-    <project.oauth.version>1.15.0-rc</project.oauth.version>
+    <project.http.version>1.16.0-rc</project.http.version>
+    <project.oauth.version>1.16.0-rc</project.oauth.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>